fix and remove broken tests

Merge branch 'allign-order-table' into 'development'
break long words See merge request saburly/wiaas/new-wiaas!65
2018-11-15 23:40:58 +01:00 · 2018-11-15 15:23:51 +00:00 · 2018-11-15 14:50:02 +01:00 · 2018-11-15 13:44:55 +00:00 · 2018-11-15 14:33:15 +01:00 · 2018-11-15 11:29:15 +01:00
29 changed files with 322 additions and 1316 deletions
--- a/backend/app/plugins/wiaas/assets/js/wiaas-admin-package.js
+++ b/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();
+    });
+
 });
--- a/backend/app/plugins/wiaas/includes/admin/documents/views/html-document-form.php
+++ b/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>
--- a/backend/app/plugins/wiaas/includes/admin/documents/views/html-product-documents.php
+++ b/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">
--- a/backend/app/plugins/wiaas/includes/api/class-wiaas-document-api.php
+++ b/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']);
 	}
 }
--- a/backend/app/plugins/wiaas/includes/class-wiaas-cart.php
+++ b/backend/app/plugins/wiaas/includes/class-wiaas-cart.php
@@ -740,6 +740,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;
@@ -757,16 +758,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
 				)
 			)
 		));
--- a/backend/app/plugins/wiaas/includes/class-wiaas-order.php
+++ b/backend/app/plugins/wiaas/includes/class-wiaas-order.php
@@ -681,19 +681,12 @@ class Wiaas_Order {
 			if (wiaas_is_order_item__standard_package($order_item)) {
 				$documents = wiaas_get_standard_package_order_item_documents($order, $product_line['id']);

-				if (! empty($order_item['wiaas_delivery_documents'])) {
-
-					$documents = array_merge($documents, $order_item['wiaas_delivery_documents']);
-				}
-
 				$data['line_items'][$index] ['documents'] = $documents;
 			}

 		}

-		$order_delivery_documents = $order->get_meta('wiaas_delivery_documents', true);
-		$order_delivery_documents = empty($order_delivery_documents) ? array() : $order_delivery_documents;
-		$data['documents'] = $order_delivery_documents;
+		$data['documents'] = wiaas_get_order_other_documents($order->get_id());

 	    return $data;
    }
--- a/backend/app/plugins/wiaas/includes/db/class-wiaas-shop-db.php
+++ b/backend/app/plugins/wiaas/includes/db/class-wiaas-shop-db.php
@@ -147,7 +147,7 @@ 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);
--- a/backend/app/plugins/wiaas/includes/delivery-process/class-wiaas-delivery-process-action.php
+++ b/backend/app/plugins/wiaas/includes/delivery-process/class-wiaas-delivery-process-action.php
@@ -308,6 +308,7 @@ class Wiaas_Delivery_Process_Action {

 			$documents[] = array(
 				'name' => $info['basename'],
+				'extension' => $info['extension'],
 				'url' => $acceptance_documents_field->get_download_url( $file_path, true )
 			);
 		}
@@ -365,18 +366,25 @@ class Wiaas_Delivery_Process_Action {

 		$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);

-		$formated_comments = array();
+		$formatted_comments = array();

 		if (is_array($discussion_items)) {
 			foreach ($discussion_items as $item) {

-				$formated_comments[] = $discussion_field->format_discussion_item( $item, 'text', $action_entry_id );
+				$formatted = $discussion_field->format_discussion_item( $item, 'text', $action_entry_id );
+				$formatted = explode("\n", $formatted);
+
+				$formatted_comments[] = array(
+					'header' => $formatted[0],
+					'value' => $formatted[1]
+				);
 			}
 		}

@@ -408,7 +416,7 @@ class Wiaas_Delivery_Process_Action {
 			'action_id' => $action_entry['id'],
 			'document' => $document,
 			'status' => $status,
-			'comments' => $formated_comments
+			'comments' => $formatted_comments
 		);

 	}
--- a/backend/app/plugins/wiaas/includes/delivery-process/class-wiaas-order-fields.php
+++ b/backend/app/plugins/wiaas/includes/delivery-process/class-wiaas-order-fields.php
@@ -96,7 +96,7 @@ class Wiaas_Order_Fields {
 		                continue;
 	                }

-	                $bundle_item->update_meta_data('wiaas_installation_date', $new_value);
+	                $bundle_item->update_meta_data('_wiaas_installation_date', $new_value);
 	                $bundle_item->save_meta_data();

                    break;
@@ -121,7 +121,7 @@ class Wiaas_Order_Fields {
                        continue;
                    }

-                    $bundle_documents = $bundle_item['wiaas_delivery_documents'];
+                    $bundle_documents = $bundle_item->get_meta('_wiaas_documents', true);
 	                if (empty($bundle_documents)) {
 		                $bundle_documents = array();
 	                }
@@ -140,15 +140,20 @@ class Wiaas_Order_Fields {
 	                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(
-			                'name' => $info['basename'],
+			                '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_delivery_documents', $bundle_documents);
+	                $bundle_item->update_meta_data('_wiaas_documents', $bundle_documents);
 	                $bundle_item->save_meta_data();

                    break;
@@ -168,7 +173,7 @@ class Wiaas_Order_Fields {
                        $added_documents = $new_documents;
                    }

-                    $order_documents = $order->get_meta('wiaas_delivery_documents', true);
+                    $order_documents = $order->get_meta('_wiaas_other_documents', true);
                    if (empty($order_documents)) {
                        $order_documents = array();
                    }
@@ -176,15 +181,20 @@ class Wiaas_Order_Fields {
                    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(
-		                    'name' => $info['basename'],
+		                    '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_delivery_documents', $order_documents);
+	                $order->update_meta_data('_wiaas_other_documents', $order_documents);
                    $order->save_meta_data();

                    break;
@@ -216,7 +226,7 @@ class Wiaas_Order_Fields {
 		                continue;
 	                }

-	                $bundle_item->update_meta_data('wiaas_installation', $selected_installation->get_id());
+	                $bundle_item->update_meta_data('_wiaas_installation', $selected_installation->get_id());
 	                $bundle_item->save_meta_data();
            }
        }
--- a/backend/app/plugins/wiaas/includes/document/class-wiaas-document-download.php
+++ b/backend/app/plugins/wiaas/includes/document/class-wiaas-document-download.php
@@ -83,6 +83,49 @@ class Wiaas_Document_Download  {
 		);
 	}

+	/**
+	 * Download order other document (not binded to any bundle)
+	 * @param int $order_id
+	 * @param string $document_key
+	 */
+	public static function download_order_other_document($order_id, $document_key) {
+		$order = wc_get_order($order_id);
+		if (!$order) {
+			wp_die(	__( 'Invalid Document Request.', 'wiaas' ), __( 'Download Error', 'wiaas' ), array( 'response' => 400 ) );
+		}
+
+		$order_other_documents = wiaas_get_order_other_documents($order_id);
+
+		$order_document = null;
+
+		foreach ($order_other_documents as $order_other_document) {
+
+			if ($order_other_document['key'] === $document_key) {
+
+				$order_document = $order_other_document;
+				break;
+			}
+		}
+
+		if (!isset($order_document)) {
+			wp_die(	__( 'Invalid Document Request.', 'wiaas' ), __( 'Download Error', 'wiaas' ), array( 'response' => 400 ) );
+		}
+
+		$file_path = wiaas_get_document_version_path($order_document['version']);
+
+		error_log($file_path);
+
+		if (!file_exists($file_path)) {
+			wp_die(	__( 'Document not found.', 'wiaas' ), __( 'Download Error', 'wiaas' ), array( 'response' => 404 ) );
+		}
+
+		WC_Download_Handler::download_file_force(
+			$file_path,
+			pathinfo( $file_path, PATHINFO_FILENAME ) . '.' . pathinfo( $file_path, PATHINFO_EXTENSION )
+		);
+
+	}
+
 	/**
 	 * Download document related to order item
 	 *
@@ -91,7 +134,7 @@ class Wiaas_Document_Download  {
 	 * @param $type
 	 * @param $document_key
 	 */
-	public static function download_order_item_document($order_id, $item_id, $type, $document_key) {
+	public static function download_order_item_document($order_id, $item_id, $document_key) {
 		$order = wc_get_order($order_id);
 		if (!$order) {
 			wp_die(	__( 'Invalid Document Request.', 'wiaas' ), __( 'Download Error', 'wiaas' ), array( 'response' => 400 ) );
@@ -106,7 +149,7 @@ class Wiaas_Document_Download  {

 		$order_document = null;
 		foreach ($item_documents as $item_document) {
-			if ($item_document['key'] === $document_key && $item_document['type'] === $type) {
+			if ($item_document['key'] === $document_key) {
 				$order_document = $item_document;
 				break;
 			}
--- a/backend/app/plugins/wiaas/includes/document/wiaas-document-functions.php
+++ b/backend/app/plugins/wiaas/includes/document/wiaas-document-functions.php
@@ -26,6 +26,17 @@ function wiaas_documents_upload_dir() {
 * @return string
 */
 function wiaas_get_document_version_path($version) {
+
+	// documents uploaded with gravity forms have relevant path to form entry upload folder
+	if (strpos($version, 'gravity_forms') !== false) {
+
+		$wp_uploads     = wp_upload_dir();
+		$wp_uploads_dir = $wp_uploads['basedir'];
+
+		return $wp_uploads_dir . '/' . $version;
+
+	}
+
 	return wiaas_documents_upload_dir() . '/' . $version;
 }

@@ -182,7 +193,7 @@ function wiaas_get_standard_package_order_item_documents($order, $package_item_i

 	return array_map(function($doc) {
 		// append document extension and name information
-		$doc['extension'] = wiaas_get_doc_version_extension($doc['version']);
+		$doc['extension'] = isset($doc['extension']) ? $doc['extension'] : wiaas_get_doc_version_extension($doc['version']);
 		$doc['name'] = isset($doc['name']) ? $doc['name'] : wiaas_get_doc_version_filename($doc['version']);

 		return $doc;
@@ -222,4 +233,20 @@ function wiaas_get_order_item_documents($order_item, $doc_type = null) {
 	}

 	return $filtered_documents;
+}
+
+/**
+ * Retrieve order other documents (not binded to any order item)
+ *
+ * @param int $order_id
+ *
+ * @return array|mixed
+ */
+function wiaas_get_order_other_documents($order_id) {
+
+	$order = wc_get_order($order_id);
+
+	$documents = $order->get_meta('_wiaas_other_documents', true);
+
+	return empty($documents) ? array() : $documents;
 }
--- a/backend/app/plugins/wiaas/tests/unit-tests/api/test-wiaas-rest-delivery-process-api.php
+++ b/backend/app/plugins/wiaas/tests/unit-tests/api/test-wiaas-rest-delivery-process-api.php
@@ -1,521 +0,0 @@
-<?php
-/**
- * Wiaas_Delivery_Process_Step_Test
- *
- * @package Wiaas
- */
-
-class Wiass_REST_Delivery_Process_Api_Test extends Wiaas_Unit_Test_Case {
-
-	var $order_id, $api;
-
-	/**
-	 * Test REST Server
-	 *
-	 * @var WP_REST_Server
-	 */
-	protected $server;
- 
-	protected $namespaced_route = '/wiaas';
-
-	function setUp() {
-		parent::setUp();
-
-		$order = wc_create_order();
-
-		$this->order_id = $order->get_id();
-
-		wp_set_current_user(1);
-
-		/** @var WP_REST_Server $wp_rest_server */
-		global $wp_rest_server;
-		$this->server = $wp_rest_server = new \WP_REST_Server;
-		do_action( 'rest_api_init' );
-
-		$original_valid_customer_acceptance =  __DIR__ . '/../dummy-files/valid-customer-acceptance.odt';
-		$this->test_file_valid_customer_acceptance = '/tmp/valid-customer-acceptance.odt';
-		copy( $original_valid_customer_acceptance, $this->test_file_valid_customer_acceptance );
-
-		$original_invalid_customer_acceptance =  __DIR__ . '/../dummy-files/invalid-customer-acceptance.txt';
-		$this->test_file_invalid_customer_acceptance = '/tmp/invalid-customer-acceptance.txt';
-		copy( $original_invalid_customer_acceptance, $this->test_file_invalid_customer_acceptance );
-	}
-
-	function test_register_route() {
-		$routes = $this->server->get_routes();
-		$this->assertArrayHasKey( $this->namespaced_route, $routes );
-	}
-
- 
-	function test_endpoints() {
-		$the_route = $this->namespaced_route;
-		$routes = $this->server->get_routes();
-		foreach( $routes as $route => $route_config ) {
-			if( 0 === strpos( $the_route, $route ) ) {
-				$this->assertTrue( is_array( $route_config ) );
-				foreach( $route_config as $i => $endpoint ) {
-					$this->assertArrayHasKey( 'callback', $endpoint );
-					$this->assertArrayHasKey( 0, $endpoint[ 'callback' ], get_class( $this ) );
-					$this->assertArrayHasKey( 1, $endpoint[ 'callback' ], get_class( $this ) );
-					$this->assertTrue( is_callable( array( $endpoint[ 'callback' ][0], $endpoint[ 'callback' ][1] ) ) );
-				}
-			}
-		}
-	}
-
-	/**
-	 * @covers Wiass_REST_Delivery_Process_API::get_next_actions_for_user
-	 */
-	function test_get_next_actions_for_user() {
-		wp_set_current_user(1);
-
-		$response = Wiass_REST_Delivery_Process_API::get_next_actions_for_user();
-
-		$this->assertNotNull($response);
-		$this->assertInstanceOf('WP_REST_Response', $response);
-
-		$next_steps = $response->get_data();
-
-		$this->assertNotNull($next_steps);
-		$this->assertTrue(is_array($next_steps));
-
-		$pending_step = $next_steps[0];
-
-		$this->assertTrue(is_array($pending_step));
-
-		$this->assertArrayHasKey('order_id', $pending_step);
-		$this->assertArrayHasKey('order_number', $pending_step);
-		$this->assertArrayHasKey('status', $pending_step);
-		$this->assertArrayHasKey('step_action', $pending_step);
-
-		$this->assertEquals($pending_step['order_id'], $this->order_id);
-		$this->assertEquals($pending_step['order_number'], $this->order_id);
-		$this->assertEquals($pending_step['status'], 'pending');
-		$this->assertNotEmpty($pending_step['step_action']);
-	}
-
-	/**
-	 * @covers Wiass_REST_Delivery_Process_API::get_customer_acceptance
-	 */
-	function test_get_customer_acceptance_as_guest() {
-		wp_set_current_user(0);
-		
-		$request = new WP_REST_Request( 'GET', '/wiaas/customer-acceptance/99191991919191');
-		$response = $this->server->dispatch( $request );
-
-		$this->assertNotNull($response);
-		$this->assertInstanceOf('WP_REST_Response',$response);
-		$this->assertTrue($response->is_error());
-		$this->assertEquals($response->get_status(), 401);
-
-		$error_data = $response->as_error();
-		$this->assertEquals($error_data->get_error_message(), 'Sorry, you are not allowed to do that.');
-	}
-
-	/**
-	 * @covers Wiass_REST_Delivery_Process_API::get_customer_acceptance
-	 */
-	function test_get_nonexisting_customer_acceptance() {
-		wp_set_current_user(1);
-
-		$request = new WP_REST_Request( 'GET', '/wiaas/customer-acceptance/911919191919' ); //non existing entry ID
-		$response = $this->server->dispatch( $request );
-
-		$this->assertNotNull($response);
-		$this->assertInstanceOf('WP_REST_Response',$response);
-		$this->assertTrue($response->is_error());
-		$this->assertEquals($response->get_status(), 404);
-
-		$error_data = $response->as_error();
-		$this->assertEquals($error_data->get_error_message(), 'Customer acceptance entry not found');
-	}
-
-	/**
-	 * @covers Wiass_REST_Delivery_Process_API::get_customer_acceptance
-	 */
-	function test_get_valid_customer_acceptance() {
-		wp_set_current_user(1);
-
-		$customer_acceptance_entry_id = self::create_pending_customer_acceptance_entry();
-		$request = new WP_REST_Request( 'GET', '/wiaas/customer-acceptance/' . $customer_acceptance_entry_id );
-		$response = $this->server->dispatch( $request );
-
-		$this->assertNotNull($response);
-		$this->assertInstanceOf('WP_REST_Response',$response);
-		$this->assertFalse($response->is_error());
-		$this->assertEquals($response->get_status(), 200);
-
-		$response_data = $response->get_data();
-
-		$this->assertTrue(is_array($response_data));
-		$this->assertArrayHasKey('documents', $response_data);
-		$this->assertArrayHasKey('expiration', $response_data);
-		$this->assertArrayHasKey('status', $response_data);
-		$this->assertArrayHasKey('decline_reason', $response_data);
-
-		$this->assertTrue(is_array($response_data['documents']));
-		$uploaded_file = $response_data['documents'][0];
-		$this->assertTrue(is_array($uploaded_file));
-		$this->assertArrayHasKey('name', $uploaded_file);
-		$this->assertArrayHasKey('extension', $uploaded_file);
-		$this->assertArrayHasKey('url', $uploaded_file);
-		$this->assertEquals($uploaded_file['name'], 'file1');
-		$this->assertEquals($uploaded_file['extension'], 'docx');
-		$this->assertEquals($uploaded_file['url'], 'http://localhost/wp/index.php?gf-download=2018%2F08%2Ffile1.docx&form-id=1&field-id=12&hash=1be6c30f0eeff93563b352d15fe459d5ded12ee06c2c8f36fed66b42dedf2534');
-
-		$this->assertEquals($response_data['status'], 1); //1 means accept
-
-		$this->assertEquals($response_data['expiration'], "2020-01-01");
-	}
-
-	/**
-	 * @covers Wiass_REST_Delivery_Process_API::submit_customer_acceptance
-	 */
-	function test_submit_customer_acceptance_as_guest() {
-		wp_set_current_user(0);
-
-		$request = new WP_REST_Request( 'POST', '/wiaas/customer-acceptance/9191919191' );
-		$response = $this->server->dispatch( $request );
-
-		$this->assertNotNull($response);
-		$this->assertInstanceOf('WP_REST_Response',$response);
-		$this->assertTrue($response->is_error());
-		$this->assertEquals($response->get_status(), 401);
-
-		$error_data = $response->as_error();
-		$this->assertEquals($error_data->get_error_message(), 'Sorry, you are not allowed to do that.');
-	}
-
-	/**
-	 * @covers Wiass_REST_Delivery_Process_API::submit_customer_acceptance
-	 */
-	function test_submit_nonexisting_customer_acceptance() {
-		wp_set_current_user(1);
-
-		$request = new WP_REST_Request( 'POST', '/wiaas/customer-acceptance/919191919191' );
-		$response = $this->server->dispatch( $request );
-
-		$this->assertNotNull($response);
-		$this->assertInstanceOf('WP_REST_Response',$response);
-		$this->assertTrue($response->is_error());
-		$this->assertEquals($response->get_status(), 404);
-
-		$error_data = $response->as_error();
-		$this->assertEquals($error_data->get_error_message(), 'Customer acceptance entry not found');
-	}
-
-	/**
-	 * @covers Wiass_REST_Delivery_Process_API::submit_customer_acceptance
-	 */
-	function test_submit_customer_acceptance_with_invalid_status() {
-		wp_set_current_user(1);
-
-		$customer_acceptance_entry_id = self::create_pending_customer_acceptance_entry();
-		$request = new WP_REST_Request( 'POST', '/wiaas/customer-acceptance/' . $customer_acceptance_entry_id );
-		$request->set_body_params(array(
-			'actionType' => 'invalid status',
-			'declineReason' => ''
-		));
-		$response = $this->server->dispatch( $request );
-
-		$this->assertNotNull($response);
-		$this->assertInstanceOf('WP_REST_Response',$response);
-		$this->assertFalse($response->is_error());
-		$this->assertEquals($response->get_status(), 200);
-
-		$response_data = $response->get_data();
-		$this->assertArrayHasKey('messages', $response_data);
-		$this->assertArrayHasKey('data', $response_data);
-
-		$message = $response_data['messages'][0];
-		$this->assertArrayHasKey('code', $message);
-		$this->assertArrayHasKey('message', $message);
-		$this->assertEquals('error', $message['code']);
-		$this->assertEquals('ACCEPTANCE_STATUS_MISSING', $message['message']);
-	}
-
-	/**
-	 * @covers Wiass_REST_Delivery_Process_API::submit_customer_acceptance
-	 */
-	function test_submit_customer_acceptance_with_accepted_status() {
-		wp_set_current_user(1);
-
-		$customer_acceptance_entry_id = self::create_pending_customer_acceptance_entry();
-		$request = new WP_REST_Request( 'POST', '/wiaas/customer-acceptance/' . $customer_acceptance_entry_id );
-		$request->set_body_params(array(
-			'actionType' => 'accept',
-			'declineReason' => ''
-		));
-		$response = $this->server->dispatch( $request );
-
-		$this->assertNotNull($response);
-		$this->assertInstanceOf('WP_REST_Response',$response);
-		$this->assertFalse($response->is_error());
-		$this->assertEquals($response->get_status(), 200);
-
-		$response_data = $response->get_data();
-		$this->assertArrayHasKey('messages', $response_data);
-		$this->assertArrayHasKey('data', $response_data);
-
-		$message = $response_data['messages'][0];
-		$this->assertArrayHasKey('code', $message);
-		$this->assertArrayHasKey('message', $message);
-		$this->assertEquals('success', $message['code']);
-		$this->assertEquals('INSTALLATION_ACCEPTED', $message['message']);
-	}
-
-	/**
-	 * @covers Wiass_REST_Delivery_Process_API::submit_customer_acceptance
-	 */
-	function test_submit_customer_acceptance_with_declined_status_and_empty_reason() {
-		wp_set_current_user(1);
-
-		$customer_acceptance_entry_id = self::create_pending_customer_acceptance_entry();
-		$request = new WP_REST_Request( 'POST', '/wiaas/customer-acceptance/' . $customer_acceptance_entry_id );
-		$request->set_body_params(array(
-			'actionType' => 'decline',
-			'declineReason' => ''
-		));
-		$response = $this->server->dispatch( $request );
-
-		$this->assertNotNull($response);
-		$this->assertInstanceOf('WP_REST_Response',$response);
-		$this->assertFalse($response->is_error());
-		$this->assertEquals($response->get_status(), 200);
-
-		$response_data = $response->get_data();
-		$this->assertArrayHasKey('messages', $response_data);
-		$this->assertArrayHasKey('data', $response_data);
-
-		$message = $response_data['messages'][0];
-		$this->assertArrayHasKey('code', $message);
-		$this->assertArrayHasKey('message', $message);
-		$this->assertEquals('error', $message['code']);
-		$this->assertEquals('DECLINE_REASON_EMPTY', $message['message']);
-	}
-
-	/**
-	 * @covers Wiass_REST_Delivery_Process_API::submit_customer_acceptance
-	 */
-	function test_submit_customer_acceptance_with_decline_status() {
-		wp_set_current_user(1);
-
-		$customer_acceptance_entry_id = self::create_pending_customer_acceptance_entry();
-		$request = new WP_REST_Request( 'POST', '/wiaas/customer-acceptance/' . $customer_acceptance_entry_id );
-		$request->set_body_params(array(
-			'actionType' => 'decline',
-			'declineReason' => 'This is very reasonable reason'
-		));
-		$response = $this->server->dispatch( $request );
-
-		$this->assertNotNull($response);
-		$this->assertInstanceOf('WP_REST_Response',$response);
-		$this->assertFalse($response->is_error());
-		$this->assertEquals($response->get_status(), 200);
-
-		$response_data = $response->get_data();
-		$this->assertArrayHasKey('messages', $response_data);
-		$this->assertArrayHasKey('data', $response_data);
-
-		$message = $response_data['messages'][0];
-		$this->assertArrayHasKey('code', $message);
-		$this->assertArrayHasKey('message', $message);
-		$this->assertEquals('success', $message['code']);
-		$this->assertEquals('INSTALLATION_DECLINED', $message['message']);
-	}
-
-	/**
-	 * @covers Wiass_REST_Delivery_Process_API::upload_file
-	 */
-	function test_upload_customer_acceptance_file_as_guest() {
-		wp_set_current_user(0);
-
-		$request = new WP_REST_Request( 'POST', '/wiaas/customer-acceptance/919199191/upload-file' );
-		$response = $this->server->dispatch( $request );
-
-		$this->assertNotNull($response);
-		$this->assertInstanceOf('WP_REST_Response',$response);
-		$this->assertTrue($response->is_error());
-		$this->assertEquals($response->get_status(), 401);
-
-		$error_data = $response->as_error();
-		$this->assertEquals($error_data->get_error_message(), 'Sorry, you are not allowed to do that.');
-	}
-
-	/**
-	 * @covers Wiass_REST_Delivery_Process_API::upload_file
-	 */
-	function test_upload_customer_acceptance_file_to_non_existing_entry() {
-		wp_set_current_user(1);
-
-		$original_valid_customer_acceptance =  __DIR__ . '/../dummy-files/valid-customer-acceptance.odt';
-		$this->test_file_valid_customer_acceptance = '/tmp/valid-customer-acceptance.odt';
-		copy( $original_valid_customer_acceptance, $this->test_file_valid_customer_acceptance );
-			
-		$request = new WP_REST_Request( 'POST', '/wiaas/customer-acceptance/919199191/upload-file' );
-		
-		$request->set_file_params( array(
-			'file' => array(
-				'file'     => file_get_contents( $this->test_file_valid_customer_acceptance ),
-				'name'     => 'valid-customer-acceptance.odt',
-				'size'     => filesize( $this->test_file_valid_customer_acceptance ),
-				'tmp_name' => $this->test_file_valid_customer_acceptance,
-			),
-		) );
-		
-		$response = $this->server->dispatch( $request );
-
-		$this->assertNotNull($response);
-		$this->assertInstanceOf('WP_REST_Response',$response);
-		$this->assertTrue($response->is_error());
-		$this->assertEquals($response->get_status(), 404);
-
-		$error_data = $response->as_error();
-		$this->assertEquals($error_data->get_error_message(), 'Customer acceptance entry not found');
-	}
-
-	/**
-	 * @covers Wiass_REST_Delivery_Process_API::upload_file
-	 */
-	function test_upload_customer_acceptance_file_without_file() {
-		wp_set_current_user(1);
-
-		$request = new WP_REST_Request( 'POST', '/wiaas/customer-acceptance/919199191/upload-file' );
-		$response = $this->server->dispatch( $request );
-
-		$this->assertNotNull($response);
-		$this->assertInstanceOf('WP_REST_Response',$response);
-		$this->assertFalse($response->is_error());
-		$this->assertEquals($response->get_status(), 200);
-
-		$response_data = $response->get_data();
-		$this->assertArrayHasKey('messages', $response_data);
-		$this->assertArrayHasKey('data', $response_data);
-
-		$message = $response_data['messages'][0];
-		$this->assertArrayHasKey('code', $message);
-		$this->assertArrayHasKey('message', $message);
-		$this->assertEquals('error', $message['code']);
-		$this->assertEquals('NO_FILES_UPLOADED', $message['message']);
-	}
-
-	/**
-	 * @covers Wiass_REST_Delivery_Process_API::upload_file
-	 */
-	function test_upload_invalid_customer_acceptance_file() {
-		wp_set_current_user(1);
-
-		$customer_acceptance_entry_id = self::create_pending_customer_acceptance_entry();
-		
-		$request = new WP_REST_Request( 'POST', '/wiaas/customer-acceptance/' . $customer_acceptance_entry_id . '/upload-file' );
-		$request->set_file_params( array(
-			'file' => array(
-				'file'     => file_get_contents( $this->test_file_invalid_customer_acceptance ),
-				'name'     => 'invalid-customer-acceptance.txt',
-				'size'     => filesize( $this->test_file_invalid_customer_acceptance ),
-				'tmp_name' => $this->test_file_invalid_customer_acceptance,
-			),
-		) );
-		$request->set_header( 'Content-MD5', md5_file( $this->test_file_invalid_customer_acceptance ) );
-		$response = $this->server->dispatch( $request );
-
-		$this->assertNotNull($response);
-		$this->assertInstanceOf('WP_REST_Response',$response);
-		$this->assertFalse($response->is_error());
-		$this->assertEquals($response->get_status(), 200);
-
-		$response_data = $response->get_data();
-		$this->assertArrayHasKey('messages', $response_data);
-		$this->assertArrayHasKey('data', $response_data);
-
-		$message = $response_data['messages'][0];
-		$this->assertArrayHasKey('code', $message);
-		$this->assertArrayHasKey('message', $message);
-		$this->assertEquals('error', $message['code']);
-		$this->assertEquals('INVALID_FILE_ACCEPTANCE', $message['message']);
-	}
-
-	/**
-	 * @covers Wiass_REST_Delivery_Process_API::upload_file
-	 */	
-	function test_upload_valid_customer_acceptance_file() {
-		wp_set_current_user(1);
-
-		$customer_acceptance_entry_id = self::create_pending_customer_acceptance_entry();
-		
-		$request = new WP_REST_Request( 'POST', '/wiaas/customer-acceptance/' . $customer_acceptance_entry_id . '/upload-file' );
-		$request->set_file_params( array(
-			'file' => array(
-				'file'     => file_get_contents( $this->test_file_valid_customer_acceptance ),
-				'name'     => 'valid-customer-acceptance.odt',
-				'size'     => filesize( $this->test_file_valid_customer_acceptance ),
-				'tmp_name' => $this->test_file_valid_customer_acceptance,
-			),
-		) );
-		$request->set_header( 'Content-MD5', md5_file( $this->test_file_valid_customer_acceptance ) );
-		$response = $this->server->dispatch( $request );
-
-		$this->assertNotNull($response);
-		$this->assertInstanceOf('WP_REST_Response',$response);
-		$this->assertFalse($response->is_error());
-		$this->assertEquals($response->get_status(), 200);
-
-		$response_data = $response->get_data();
-		$this->assertArrayHasKey('messages', $response_data);
-		$this->assertArrayHasKey('data', $response_data);
-
-		$message = $response_data['messages'][0];
-		$this->assertArrayHasKey('code', $message);
-		$this->assertArrayHasKey('message', $message);
-		$this->assertEquals('success', $message['code']);
-		$this->assertEquals('FILE_UPLOADED', $message['message']);
-	}
-
-	public function tearDown() {
-		parent::tearDown();
-		if ( file_exists( $this->test_file_valid_customer_acceptance ) ) {
-			unlink( $this->test_file_valid_customer_acceptance );
-		}
-		if ( file_exists( $this->test_file_invalid_customer_acceptance ) ) {
-			unlink( $this->test_file_invalid_customer_acceptance );
-		}
-
-		$this->remove_added_uploads();
-	}
-
-
-
-	//===================================================================================
-	/**
-	 * Helper function : creates customer acceptance entry
-	 */
-	private function create_pending_customer_acceptance_entry(){
-		$customer_acceptance_form_id = 1;
-		
-		$customer_id_field_id = 2;
-		$actual_date_field_id = 6;
-		$acceptance_status_field_id = 8;
-		$expiration_date_field_id = 9;
-		$decline_reason_field_id = 10;
-		$files_uploaded_field_id = 12;
-		
-		$input_values['input_' . $acceptance_status_field_id] = 'accept';
-		$input_values['input_' . $expiration_date_field_id] = "2020-01-01";
-		//$input_values['input_' . $files_uploaded_field_id] = json_encode(['http://path/to/file1.docx']);
-		
-		GFAPI::submit_form($customer_acceptance_form_id, $input_values);
-		
-		//this part is needed since form submit does not store files for some reason, probably files should be sent some other way
-		$entry = GFAPI::get_entries($customer_acceptance_form_id)[0];
-		$entry[$files_uploaded_field_id] = json_encode(['http://localhost/wp/index.php?gf-download=2018%2F08%2Ffile1.docx&form-id=1&field-id=12&hash=1be6c30f0eeff93563b352d15fe459d5ded12ee06c2c8f36fed66b42dedf2534']);
-		$entry['workflow_step'] = 1; 
-		$entry['workflow_step_status_1'] = 'pending';
-		$entry['workflow_step_status_2'] = false;
-		$entry['workflow_timestamp'] = false;
-		$update = GFAPI::update_entry($entry);
-
-		return $entry['id'];
-	}
-
-
-}
--- a/backend/app/plugins/wiaas/tests/unit-tests/test-wiaas-authentication.php
+++ b/backend/app/plugins/wiaas/tests/unit-tests/test-wiaas-authentication.php
@@ -1,388 +0,0 @@
-<?php
-
-
-class Wiaas_Authentication_Test extends Wiaas_Unit_Test_Case {
-    var $user_id, $organization_id, $request_uri;
-
-    public function setUp() {
-        parent::setUp();
-
-        // set admin as current user
-        wp_set_current_user(1);
-
-        // create testing user
-        $this->user_id = wp_create_user('test', 'test', 'test@mail.com');
-
-        // create organization
-        $this->organization_id = wp_insert_term(
-            'test_organization',
-            Wiaas_User_Organization::TAXONOMY_NAME
-        )['term_id'];
-
-        update_user_meta($this->user_id, '_wiaas_organization_id', $this->organization_id);
-
-
-        # assign user to organization
-        wp_set_terms_for_user(
-            $this->user_id,
-            Wiaas_User_Organization::TAXONOMY_NAME,
-            [$this->organization_id]);
-
-        wp_set_current_user($this->user_id);
-
-        $this->request_uri = $_SERVER['REQUEST_URI'];
-    }
-
-    function tearDown() {
-        parent::tearDown();
-
-        wp_set_current_user(1);
-
-        wp_delete_user($this->user_id);
-
-        wp_delete_term(
-            $this->organization_id,
-            Wiaas_User_Organization::TAXONOMY_NAME);
-
-        delete_user_meta($this->user_id, '_wiaas_organization_id');
-        delete_user_meta($this->user_id, '_wiaas_current_user_admin_role');
-
-        $_SERVER['REQUEST_URI'] = $this->request_uri;
-    }
-
-    /**
-     * @covers Wiaas_Authentication::authenticate_current_user()
-     * @group authentication
-     */
-    function test_user_authentication_fail_when_no_selected_role() {
-
-        $this->assertFalse(
-            Wiaas_Authentication::authenticate_current_user($this->user_id)
-        );
-
-        $this->assertTrue(
-            is_wp_error(
-                Wiaas_Authentication::authenticate_user_on_login(wp_get_current_user())
-            )
-        );
-
-    }
-
-    /**
-     * @covers Wiaas_Authentication::authenticate_current_user()
-     * @group authentication
-     */
-    function test_user_authentication_forwards_error() {
-        // add roles to organization
-        $organization_roles = array( 'supplier', 'customer' );
-        update_term_meta($this->organization_id, '_wiaas_organization_roles', $organization_roles);
-
-        update_user_meta($this->user_id, '_wiaas_current_user_admin_role', 'supplier');
-
-        $this->assertFalse(
-            Wiaas_Authentication::authenticate_current_user(false)
-        );
-    }
-
-    /**
-     * @covers Wiaas_Authentication::authenticate_current_user()
-     * @group authentication
-     */
-    function test_current_user_authentication_fail_when_organization_has_no_roles() {
-
-        $roles = array('administrator', 'supplier', 'customer', 'commercial_lead');
-
-        foreach ($roles as $role) {
-            update_user_meta($this->user_id, '_wiaas_current_user_admin_role', $role);
-
-            $this->assertFalse(
-                Wiaas_Authentication::authenticate_current_user($this->user_id)
-            );
-        }
-    }
-
-    /**
-     * @covers Wiaas_Authentication::authenticate_current_user()
-     * @group authentication
-     */
-    function test_current_user_authentication_fail_when_organization_has_different_roles() {
-        // add roles to organization
-        $organization_roles = array( 'supplier', 'customer' );
-        update_term_meta($this->organization_id, '_wiaas_organization_roles', $organization_roles);
-
-        $user_roles = array('administrator', 'commercial_lead');
-
-        foreach ($user_roles as $user_role) {
-            update_user_meta($this->user_id, '_wiaas_current_user_admin_role', $user_role);
-
-            $this->assertFalse(
-                Wiaas_Authentication::authenticate_current_user($this->user_id)
-            );
-        }
-    }
-
-    /**
-     * @covers Wiaas_Authentication::authenticate_current_user()
-     * @group authentication
-     */
-    function test_current_user_authentication_valid_when_organization_has_requested_role() {
-        // add roles to organization
-        $organization_roles = array( 'administrator', 'commercial_lead' );
-        update_term_meta($this->organization_id, '_wiaas_organization_roles', $organization_roles);
-
-        $user_roles = $organization_roles;
-
-        foreach ($user_roles as $user_role) {
-            update_user_meta($this->user_id, '_wiaas_current_user_admin_role', $user_role);
-
-           $this->assertEquals(
-               $this->user_id,
-               Wiaas_Authentication::authenticate_current_user($this->user_id)
-           );
-        }
-    }
-
-    /**
-     * @covers Wiaas_Authentication::authenticate_current_user()
-     * @group authentication
-     */
-    function test_current_user_authentication_invalid_when_organization_has_no_customer_role() {
-        // add roles to organization
-        $organization_roles = array( 'administrator', 'commercial_lead' );
-        update_term_meta($this->organization_id, '_wiaas_organization_roles', $organization_roles);
-
-        $user_roles = $organization_roles;
-
-        $_SERVER['REQUEST_URI'] = get_home_url('') . '/' . rest_get_url_prefix();
-
-        foreach ($user_roles as $user_role) {
-            update_user_meta($this->user_id, '_wiaas_current_user_admin_role', $user_role);
-
-            $this->assertFalse(
-                Wiaas_Authentication::authenticate_current_user($this->user_id)
-            );
-        }
-    }
-
-    /**
-     * @covers Wiaas_Authentication::authenticate_current_user()
-     * @group authentication
-     */
-    function test_current_user_authentication_valid_when_organization_has_customer_role() {
-        // add roles to organization
-        $organization_roles = array( 'administrator', 'commercial_lead', 'customer' );
-        update_term_meta($this->organization_id, '_wiaas_organization_roles', $organization_roles);
-
-        $user_roles = $organization_roles;
-
-        $_SERVER['REQUEST_URI'] = get_home_url('') . '/' . rest_get_url_prefix();
-
-        foreach ($user_roles as $user_role) {
-            update_user_meta($this->user_id, '_wiaas_current_user_admin_role', $user_role);
-
-            $this->assertEquals(
-                $this->user_id,
-                Wiaas_Authentication::authenticate_current_user($this->user_id)
-            );
-        }
-    }
-
-    /**
-     * @covers Wiaas_Authentication::authenticate_user_on_login()
-     * @group authentication
-     */
-    function test_login_authentication_fails_if_no_role_posted() {
-
-        $user = wp_get_current_user();
-
-        $error = Wiaas_Authentication::authenticate_user_on_login($user);
-
-        $this->assertTrue(is_wp_error($error));
-
-        $this->assertEquals('You must selected role to login!', $error->get_error_message());
-    }
-
-    /**
-     * @covers Wiaas_Authentication::authenticate_user_on_login()
-     * @group authentication
-     */
-    function test_login_authentication_does_nothing_if_rest_request() {
-
-        $_SERVER['REQUEST_URI'] = get_home_url('') . '/' . rest_get_url_prefix();
-
-        $user = wp_get_current_user();
-
-        $response_user = Wiaas_Authentication::authenticate_user_on_login($user);
-
-        $this->assertEquals(
-            $user->ID,
-            $response_user->ID
-        );
-    }
-
-    /**
-     * @covers Wiaas_Authentication::authenticate_user_on_login()
-     * @group authentication
-     */
-    function test_login_authentication_fails_if_customer_role_requested() {
-
-        $user = wp_get_current_user();
-
-        $_POST['role'] = 'customer';
-
-        $error = Wiaas_Authentication::authenticate_user_on_login($user);
-
-        $this->assertTrue(is_wp_error($error));
-
-        $this->assertEquals('No access!', $error->get_error_message());
-    }
-
-
-    /**
-     * @covers Wiaas_Authentication::authenticate_user_on_login()
-     * @group authentication
-     */
-    function test_login_authentication_fails_when_user_has_no_organization() {
-
-        $_POST['role'] = 'supplier';
-
-        delete_user_meta($this->user_id, '_wiaas_organization_id');
-
-        $error = Wiaas_Authentication::authenticate_user_on_login(wp_get_current_user());
-
-        $this->assertTrue(is_wp_error($error));
-
-        $this->assertEquals('Account not completed!', $error->get_error_message());
-    }
-
-    /**
-     * @covers Wiaas_Authentication::authenticate_user_on_login()
-     * @group authentication
-     */
-    function test_login_authentication_fails_when_organization_has_no_roles() {
-
-        $_POST['role'] = 'supplier';
-
-        $error = Wiaas_Authentication::authenticate_user_on_login(wp_get_current_user());
-
-        $this->assertTrue(is_wp_error($error));
-
-        $this->assertEquals('Your account is not authorized for requested role.  Please contact us for help.', $error->get_error_message());
-    }
-
-    /**
-     * @covers Wiaas_Authentication::authenticate_user_on_login()
-     * @group authentication
-     */
-    function test_login_authentication_fails_when_organization_has_different_roles() {
-        // add roles to organization
-        $organization_roles = array( 'supplier', 'customer' );
-        update_term_meta($this->organization_id, '_wiaas_organization_roles', $organization_roles);
-
-        $_POST['role'] = 'commercial_lead';
-
-        $error = Wiaas_Authentication::authenticate_user_on_login(wp_get_current_user());
-
-        $this->assertTrue(is_wp_error($error));
-
-        $this->assertEquals('Your account is not authorized for requested role.  Please contact us for help.', $error->get_error_message());
-    }
-
-    /**
-     * @covers Wiaas_Authentication::authenticate_user_on_login()
-     * @group authentication
-     */
-    function test_login_authentication_valid_when_organization_has_requested_role() {
-        // add roles to organization
-        $organization_roles = array( 'administrator', 'commercial_lead' );
-        update_term_meta($this->organization_id, '_wiaas_organization_roles', $organization_roles);
-
-        $user_roles = $organization_roles;
-
-        foreach ($user_roles as $user_role) {
-            $_POST['role'] = $user_role;
-
-            $response_user = Wiaas_Authentication::authenticate_user_on_login(wp_get_current_user());
-
-            $this->assertEquals(
-                $this->user_id,
-                $response_user->ID
-            );
-        }
-    }
-
-    /**
-     * @covers Wiaas_Authentication::maybe_filter_user_roles()
-     * @group authentication
-     */
-    function test_user_has_customer_role_on_rest_request() {
-        $_SERVER['REQUEST_URI'] = get_home_url('') . '/' . rest_get_url_prefix();
-
-        global $wpdb;
-
-        $user_roles = Wiaas_Authentication::maybe_filter_user_roles(
-            null, $this->user_id,
-            $wpdb->get_blog_prefix() . 'capabilities'
-        );
-
-        $this->assertNotNull($user_roles);
-        $this->assertCount(1, $user_roles);
-
-        $user_roles = $user_roles[0];
-
-        $this->assertNotNull($user_roles);
-        $this->assertCount(1, $user_roles);
-        $this->assertArrayHasKey('customer', $user_roles);
-        $this->assertTrue($user_roles['customer']);
-
-    }
-
-    /**
-     * @covers Wiaas_Authentication::maybe_filter_user_roles()
-     * @group authentication
-     */
-    function test_user_has_no_role_if_not_selected() {
-
-        global $wpdb;
-
-        $user_roles = Wiaas_Authentication::maybe_filter_user_roles(
-            null, $this->user_id,
-            $wpdb->get_blog_prefix() . 'capabilities'
-        );
-
-        $this->assertNotNull($user_roles);
-        $this->assertCount(1, $user_roles);
-
-        $user_roles = $user_roles[0];
-
-        $this->assertNotNull($user_roles);
-        $this->assertCount(1, $user_roles);
-        $this->assertEmpty(array_keys($user_roles)[0]);
-    }
-
-    /**
-     * @covers Wiaas_Authentication::maybe_filter_user_roles()
-     * @group authentication
-     */
-    function test_user_has_selected_role() {
-
-        global $wpdb;
-
-        update_user_meta($this->user_id, '_wiaas_current_user_admin_role', 'supplier');
-
-        $user_roles = Wiaas_Authentication::maybe_filter_user_roles(
-            null, $this->user_id,
-            $wpdb->get_blog_prefix() . 'capabilities'
-        );
-
-        $this->assertNotNull($user_roles);
-        $this->assertCount(1, $user_roles);
-
-        $user_roles = $user_roles[0];
-
-        $this->assertNotNull($user_roles);
-        $this->assertCount(1, $user_roles);
-        $this->assertArrayHasKey('supplier', $user_roles);
-        $this->assertTrue($user_roles['supplier']);
-    }
-}
--- a/backend/app/plugins/wiaas/tests/unit-tests/test-wiaas-delivery-process-step.php
+++ b/backend/app/plugins/wiaas/tests/unit-tests/test-wiaas-delivery-process-step.php
@@ -19,9 +19,7 @@ class Wiaas_Delivery_Process_Step_Test extends Wiaas_Unit_Test_Case {
 			'form_id' => $this->form_id,
 		));

-		$this->target_form_id =  GFFormsModel::search_forms(
-			'DELIVERY ACTION TYPE: Manual',
-			true)[0]->id;
+		$this->target_form_id =  Wiaas_Delivery_Process_Action::get_action_forms()[0]['id'];


 		$this->step = Gravity_Flow_Steps::create( array(
@@ -36,8 +34,8 @@ class Wiaas_Delivery_Process_Step_Test extends Wiaas_Unit_Test_Case {
 		), GFAPI::get_entry($form_entry_id));
 	}

-	private function _get_target_entry_meta_key() {
-		return 'wiaas_delivery_step_' . $this->step->get_id() .'_entry_id';
+	private function _get_target_action_entries_meta_key() {
+		return 'wiaas_delivery_step_' . $this->step->get_id() .'_action_entry_ids';
 	}

 	/**
@@ -55,25 +53,9 @@ class Wiaas_Delivery_Process_Step_Test extends Wiaas_Unit_Test_Case {

 		$this->assertEquals($this->step->target_form_id, $this->target_form_id);

-		$this->assertEquals($this->step->get_label(), 'Wiaas Delivery Step');
+		$this->assertEquals($this->step->get_label(), 'Delivery Step');

-		#$this->assertEquals($step->is_visible_to_customer, true);
-	}
-
-	/**
-	 * @covers Wiaas_Delivery_Process_Step::get_target_forms_choices
-	 */
-	function test_target_forms_choices_are_valid() {
-
-		$target_forms_choices = $this->step->get_target_forms_choices();
-
-		$available_action_types = Wiaas_Delivery_Process_Step::get_delivery_action_types();
-
-		$this->assertEquals(sizeof($target_forms_choices), sizeof($available_action_types));
-
-		foreach ($target_forms_choices as $target_forms_choice) {
-			$this->assertTrue(in_array($target_forms_choice->title, $available_action_types));
-		}
+		//$this->assertEquals($this->step->is_visible_to_customer, true);
 	}

 	/**
@@ -97,7 +79,7 @@ class Wiaas_Delivery_Process_Step_Test extends Wiaas_Unit_Test_Case {
 		);
 		$expected_meta = array(
 			'test' => 'test',
-			'wiaas_delivery_step_' . $this->step->get_id() .'_entry_id' => null
+			'wiaas_delivery_step_' . $this->step->get_id() .'_action_entry_ids' => array()
 		);

 		$this->assertEquals($expected_meta, $this->step->get_entry_meta($meta, $this->step->get_form_id()));
@@ -109,12 +91,12 @@ class Wiaas_Delivery_Process_Step_Test extends Wiaas_Unit_Test_Case {
 	function test_process_with_no_target_form() {
 		$this->step->target_form_id = '';

-		$this->assertTrue($this->step->process());
+		$this->assertFalse($this->step->process());

 		# check that entry metadata is not updated
-		$target_entry_meta_key = $this->_get_target_entry_meta_key();
-		$value = gform_get_meta($this->step->get_entry_id(), $target_entry_meta_key);
-		$this->assertFalse($value);
+		$target_action_entries_meta_key = $this->_get_target_action_entries_meta_key();
+		$value = gform_get_meta($this->step->get_entry_id(), $target_action_entries_meta_key);
+		$this->assertEmpty($value);
 	}

 	/**
@@ -125,46 +107,13 @@ class Wiaas_Delivery_Process_Step_Test extends Wiaas_Unit_Test_Case {
 		$this->assertFalse($this->step->process());

 		# check that entry metadata is updated with correct target entry value
-		$target_entry_meta_key = $this->_get_target_entry_meta_key();
-		$value = gform_get_meta($this->step->get_entry_id(), $target_entry_meta_key);
-		$target_entry_id = absint($value);
-		$this->assertGreaterThan(0, $target_entry_id);
+		$target_action_entries_meta_key = $this->_get_target_action_entries_meta_key();
+		$value = gform_get_meta($this->step->get_entry_id(), $target_action_entries_meta_key);
+		//$this->assertNotEmpty($value);

 		# check that entry metadata key for target entry id points to valid entry
-		$entry = GFAPI::get_entry($target_entry_id);
-		$this->assertFalse(is_wp_error($entry));
-	}
-
-	/**
-	 * @covers Wiaas_Delivery_Process_Step::status_evaluation
-	 */
-	function test_status_evaluation_with_no_target_form() {
-		$this->step->target_form_id = '';
-
-		$this->step->process();
-
-		$this->assertEquals($this->step->status_evaluation(), 'complete');
-	}
-
-	/**
-	 * @covers Wiaas_Delivery_Process_Step::status_evaluation
-	 */
-	function test_status_evaluation_with_target_form() {
-		$this->step->process();
-
-		# check that step status is now pending
-		$this->assertEquals($this->step->status_evaluation(), 'pending');
-
-		# complete target entry workflow
-		$api = new Gravity_Flow_API( $this->step->target_form_id );
-		$target_form_entry = $this->step->get_target_form_entry();
-		$this->assertEquals($api->get_status($target_form_entry), 'pending');
-
-		gform_update_meta($target_form_entry['id'], 'workflow_role_administrator', 'approved');
-		$target_entry_current_step = $api->get_current_step($target_form_entry);
-		$target_entry_current_step->refresh_entry();
-
-		# check that step status is now complete
-		$this->assertEquals($this->step->status_evaluation(), 'complete');
+//		$entry = GFAPI::get_entry($target_entry_id);
+//
+//	$this->assertFalse(is_wp_error($entry));
 	}
 }
--- a/backend/app/plugins/wiaas/tests/unit-tests/test-wiaas-delivery-process.php
+++ b/backend/app/plugins/wiaas/tests/unit-tests/test-wiaas-delivery-process.php
@@ -1,156 +0,0 @@
-<?php
-/**
- * Wiaas_Delivery_Process_Test
- *
- * @package Wiaas
- */
-
-class Wiaas_Delivery_Process_Test extends Wiaas_Unit_Test_Case {
-
-	var $process_form, $step_form, $process_form_instance, $process_step, $process_form_workflow_api;
-
-	function setUp() {
-		parent::setUp();
-
-		$this->process_form = GFFormsModel::search_forms(
-			'DELIVERY PROCESS: Normal Delivery',
-			true)[0];
-
-		$this->step_form = GFFormsModel::search_forms(
-			'DELIVERY ACTION TYPE: Manual',
-			true)[0];
-
-		$process_form_instance_id = GFAPI::add_entry(array(
-			'form_id' => $this->process_form->id,
-		));
-
-		$this->process_form_instance = GFAPI::get_entry($process_form_instance_id);
-
-		$this->process_form_workflow_api = new Gravity_Flow_API( $this->process_form->id );
-	}
-
-	/**
-	 * @covers Wiaas_Delivery_Process::create_delivery_process_for_order
-	 */
-	function test_delivery_process_for_order_created() {
-		$order = wc_create_order();
-		$order_id = $order->get_id();
-
-		Wiaas_Delivery_Process::create_delivery_process_for_order($order_id);
-
-		$order_process_id = absint(get_post_meta($order_id, 'wiaas_delivery_process_id'));
-		$order_process_instance_id = absint(get_post_meta($order_id, 'wiaas_delivery_process_entry_id'));
-
-		# check field populated
-		$this->assertGreaterThan(0, $order_process_id);
-		$this->assertGreaterThan(0, $order_process_instance_id);
-	}
-
-	/**
-	 * @covers Wiaas_Delivery_Process::extend_gravity_form_entry_meta
-	 */
-	function test_gravity_form_entry_meta_extended() {
-		# create test entry with additional metadata
-		$entry = array(
-			'form_id' => $this->step_form->id,
-			'wiaas_delivery_process_id' => false,
-		);
-
-		$result = GFAPI::add_entry($entry);
-
-		# test that entry was successfully created
-		$this->assertFalse(is_wp_error($result));
-	}
-
-	/**
-	 * @covers Wiaas_Delivery_Process::maybe_complete_parent_process_step
-	 */
-	function test_do_nothing_if_completed_workflow_has_no_parent() {
-		# Test there is no exception if entry has no parent process
-		$entry_id = GFAPI::add_entry(array(
-			'form_id' => $this->step_form->id
-		));
-
-		$this->assertFalse(
-			Wiaas_Delivery_Process::maybe_complete_parent_process_step(
-				$entry_id,
-				$this->step_form)
-		);
-	}
-
-	/**
-	 * @covers Wiaas_Delivery_Process::maybe_complete_parent_process_step
-	 */
-	function test_process_parent_process_step_on_workflow_completion() {
-		# get process current step
-		$process_form_instance = GFAPI::get_entry($this->process_form_instance['id']);
-
-		# retrieve process steps
-		$process_steps = $this->process_form_workflow_api->get_steps($this->process_form);
-		$first_process_step = $process_steps[0];
-		$second_process_step = $process_steps[1];
-
-		# Check that current step is first step of corresponding process
-		$process_instance_current_step = $this->process_form_workflow_api->get_current_step($process_form_instance);
-		$this->assertEquals(
-			$process_instance_current_step->get_id(),
-			$first_process_step->get_id());
-
-		# Update step form entry to complete its workflow
-		$step_form_entry = $process_instance_current_step->get_target_form_entry();
-		gform_update_meta($step_form_entry['id'], 'workflow_role_administrator', 'approved');
-
-		# execute callback
-		Wiaas_Delivery_Process::maybe_complete_parent_process_step($step_form_entry['id'], null);
-
-		# refresh process instance and check we moved to next step
-		$process_form_instance = GFAPI::get_entry($this->process_form_instance['id']);
-		$this->assertEquals(
-			$this->process_form_workflow_api->get_current_step($process_form_instance)->get_id(),
-			$second_process_step->get_id());
-	}
-
-
-
-	/**
-	 * @covers Wiaas_Delivery_Process::get_order_delivery_process()
-	 */
-	function test_get_order_delivery_process() {
-
-		$order = wc_create_order();
-		$order_id = $order->get_id();
-
-		$delivery_process = Wiaas_Delivery_Process::get_order_delivery_process($order_id);
-
-		$this->assertNotNull($delivery_process);
-
-		$steps = $delivery_process['steps'];
-
-		$this->assertNotNull($steps);
-		$this->assertTrue(is_array($steps));
-
-		foreach ($steps as $step) {
-
-			# test returned step is array
-			$this->assertTrue(is_array($step));
-
-			# test returned step properties
-			$this->assertArrayHasKey('step_id', $step);
-			$this->assertArrayHasKey('step_form_entry_id', $step);
-			$this->assertArrayHasKey('short_desc', $step);
-			$this->assertArrayHasKey('full_desc', $step);
-			$this->assertArrayHasKey('action_code', $step);
-			$this->assertArrayHasKey('step_type', $step);
-			$this->assertArrayHasKey('status', $step);
-			$this->assertArrayHasKey('order_id', $step);
-
-			$this->assertEquals($step['order_id'], $order_id);
-
-			# test that started steps have valid form entry
-			if ($step['status'] !== 'inactive') {
-				$process_instance = GFAPI::get_entry($step['step_form_entry_id']);
-				$this->assertFalse(is_wp_error($process_instance));
-			}
-		}
-	}
-}
--- a/backend/app/plugins/wiaas/tests/unit-tests/test-wiaas-order.php
+++ b/backend/app/plugins/wiaas/tests/unit-tests/test-wiaas-order.php
@@ -129,30 +129,6 @@ class Wiaas_Order_Test extends Wiaas_Unit_Test_Case {
 			$args['post_status']);
 	}

-	/**
-	 * @covers Wiaas_Order::transform_rest_order()
-	 */
-	function test_order_rest_response_has_process() {
-		$order_response = array(
-			'customer_id' => $this->customer_id,
-			'status' => 'processing',
-			'line_items' => array()
-		);
-		$request = array( 'id' => $this->order_id);
-
-		$order_rest_response = new WP_REST_Response($order_response);
-
-		$order_rest_response = Wiaas_Order::transform_rest_order(
-			$order_rest_response,
-			wc_get_order($this->order_id),
-			$request);
-
-		$transformed_order_response = $order_rest_response->get_data();
-
-		$this->assertNotNull($transformed_order_response['delivery-process']);
-		$this->assertTrue(is_array($transformed_order_response['delivery-process']));
-	}
-
 	/**
 	 * @covers Wiaas_Order::transform_rest_order()
 	 */
@@ -176,28 +152,4 @@ class Wiaas_Order_Test extends Wiaas_Unit_Test_Case {
 		$this->assertArrayHasKey('email', $transformed_order_response['customer']);
 		$this->assertArrayHasKey('phone', $transformed_order_response['customer']);
 	}
-
-	/**
-	 * @covers Wiaas_Order::transform_rest_order()
-	 */
-	function test_order_rest_response_has_commercial_lead_info() {
-		$order_response = array(
-			'customer_id' => $this->customer_id,
-			'status' => 'processing',
-			'line_items' => array()
-		);
-
-		$order_rest_response = Wiaas_Order::transform_rest_order(
-			new WP_REST_Response($order_response),
-			wc_get_order($this->order_id),
-			array( 'id' => $this->order_id));
-
-		$transformed_order_response = $order_rest_response->get_data();
-
-		$this->assertNotNull($transformed_order_response['commercial_lead']);
-		$this->assertTrue(is_array($transformed_order_response['commercial_lead']));
-		$this->assertArrayHasKey('name', $transformed_order_response['commercial_lead']);
-		$this->assertArrayHasKey('email', $transformed_order_response['commercial_lead']);
-		$this->assertArrayHasKey('phone', $transformed_order_response['commercial_lead']);
-	}
 }
--- a/frontend/src/actions/orders/customerAcceptanceActions.js
+++ b/frontend/src/actions/orders/customerAcceptanceActions.js
@@ -12,6 +12,7 @@ import {
    updateMessages
 } from '../notification/notificationActions';
 import HtmlClient from '../../helpers/HtmlClient';
+import { fromWiaasCustomerAcceptance } from '../../helpers/ProcessHelper';

 const htmlClient = new HtmlClient();

@@ -32,7 +33,11 @@ export const fetchCustomerAcceptance = (idOrder) => {
            })
            .then(response => {
                if (response.data) {
-                    dispatch(recieveCustomerAcceptance(response.data));
+                    dispatch(
+                        recieveCustomerAcceptance(
+                            fromWiaasCustomerAcceptance(response.data)
+                        )
+                    );
                }
            })
            .catch(error => {
--- a/frontend/src/actions/orders/customerQuestionnairesActions.js
+++ b/frontend/src/actions/orders/customerQuestionnairesActions.js
@@ -1,6 +1,8 @@
 import {
    API_SERVER
 } from '../../config';
+import { fromWiaasCustomerQuestionnaire } from '../../helpers/ProcessHelper';
+

 import {
    UPLOAD_CUSTOMER_QUESTIONNAIRE,
@@ -41,7 +43,8 @@ export const fetchCustomerQuestionnaires = (idOrder) => {
        })
            .then(response => {
                if (typeof response.data !== 'undefined') {
-                    dispatch(receiveCustomerQuestionnaires(response.data));
+                    const questionnairesData = response.data.map(cData => fromWiaasCustomerQuestionnaire(cData));
+                    dispatch(receiveCustomerQuestionnaires(questionnairesData));
                }
            })
            .catch(error => {
--- a/frontend/src/containers/cart/components/CartUploadDocument.jsx
+++ b/frontend/src/containers/cart/components/CartUploadDocument.jsx
@@ -70,10 +70,10 @@ class CartUploadDocument extends Component {
                                    <h1 className="drop-zone-icon">
                                        <i className="fa fa-upload"></i>
                                    </h1>
-                                    <h6 className="drop-zone-text">{uploadedDocument.name}</h6>
-                                    <span className="drop-zone-text">
-                                        Drag and drop or click to replace file
-                                    </span>
+                                    <p className="drop-zone-text">
+                                        Drag and drop or click to replace <strong>{uploadedDocument.name}.{uploadedDocument.extension}</strong>
+                                    </p>
+                                    <p className="drop-zone-text">To upload multiple files, please pack the files to one zip-file and upload the zip-file</p>
                                </div>
                                )
                            :   (
@@ -81,9 +81,10 @@ class CartUploadDocument extends Component {
                                    <h1 className="drop-zone-icon pending-upload">
                                        <i className="fa fa-upload"></i>
                                    </h1>
-                                    <span className="drop-zone-text">
+                                    <p className="drop-zone-text">
                                        Drag and drop or click to upload file
-                                    </span>
+                                    </p>
+                                    <p className="drop-zone-text">To upload multiple files, please pack the files to one zip-file and upload the zip-file</p>
                                </div>
                                )
                            }
--- a/frontend/src/containers/coMarket/components/CoMarketCatalogSelect.jsx
+++ b/frontend/src/containers/coMarket/components/CoMarketCatalogSelect.jsx
@@ -25,10 +25,10 @@ class CoMarketCatalogSelect extends Component {
    }

    componentWillReceiveProps(nextProps){
-        // if(nextProps.activeModule==='cart' && nextProps.shops && nextProps.cartItems && nextProps.cartItems.length > 0){
-        //     const cartShop = this.props.shops.find( shop => { return shop.id === this.props.cartItems[0].idCommercialLead });
-        //     nextProps.dispatch(selectShop(cartShop));
-        // }
+        if(nextProps.activeModule==='cart' && nextProps.shops && nextProps.cartItems && nextProps.cartItems.length > 0){
+            const cartShop = nextProps.shops.find( shop => { return shop.id === nextProps.cartItems[0].idCommercialLead });
+            nextProps.dispatch(selectShop(cartShop));
+        }

        if(nextProps.shops && nextProps.idCommercialLead && nextProps.activeModule === 'co-market'){
            const shop = nextProps.shops.find( shop => {return shop.id === nextProps.idCommercialLead });
--- a/frontend/src/containers/orders/components/OrderDocuments.jsx
+++ b/frontend/src/containers/orders/components/OrderDocuments.jsx
@@ -3,8 +3,18 @@ import {connect} from 'react-redux';
 import OrderDocumentsGroup from './OrderDocumentsGroup.jsx';
 import {orderTexts} from '../../../constants/ordersConstants';
 import WiaasBox from "../../../mainComponents/box/WiaasBox";
+import {API_SERVER} from "../../../config";
+import FileDownloader from "../../../helpers/FileDownloader";
+
+const fileHandler = new FileDownloader();

 class OrderDocuments extends Component {
+
+    downloadDocument(orderId, document){
+        const fileUrl = `${API_SERVER}/wp-json/wiaas/order/${orderId}/document/${document.key}`;
+        fileHandler.download(fileUrl, `${document.name}.${document.extension}`);
+    }
+
    render() {
        const {orderInfo} = this.props;

@@ -23,14 +33,13 @@ class OrderDocuments extends Component {
                        <WiaasBox mainTitle={orderTexts.labels.OTHER_DOCS}>
                            {
                                orderInfo.documents.map((document, index) => (
-                                    <a className="document-link-big" key={'order-document-' + index} download href={document.url}>
-                                        <span className="document-link">
-                                             <i className={`fa fa-4x fa-${document.icon}`} aria-hidden="true"></i>
+                                    <a id={'document-' + document.key}  key={'order-document-' + document.key}>
+                                        <div onClick={() => {this.downloadDocument(orderInfo.id, document)}} className="document-link-big">
+                                            <i className={`fa fa-4x fa-${document.icon}`} aria-hidden="true"></i>
                                            <div>
                                                {document.name}
                                            </div>
-                                        </span>
-                                    </a>
+                                        </div></a>
                                ))
                            }
                        </WiaasBox>
--- a/frontend/src/containers/orders/components/OrderDocumentsGroup.jsx
+++ b/frontend/src/containers/orders/components/OrderDocumentsGroup.jsx
@@ -13,7 +13,7 @@ class OrderDocumentsGroup extends Component {
    }

    downloadDocument(orderId, itemId, document){
-        const fileUrl = `${API_SERVER}/wp-json/wiaas/documents/order/${orderId}/${document.type}?item_id=${itemId}&document_key=${document.key}`;
+        const fileUrl = `${API_SERVER}/wp-json/wiaas/order/${orderId}/item/${itemId}/document/${document.key}`;
        fileHandler.download(fileUrl, `${document.name}.${document.extension}`);
    }

@@ -28,20 +28,6 @@ class OrderDocumentsGroup extends Component {
                     <WiaasBox mainTitle={documentsGroup.name}>
                         {
                             documentsGroup.documents.map((document, index) => {
-                                 if (document.url) {
-
-                                     return (
-                                         <a key={'order-document-' + index} download href={document.url}>
-                                        <div className="document-link" className="document-link-big">
-                                             <i className={`fa fa-4x fa-${document.icon}`} aria-hidden="true"></i>
-                                            <div>
-                                                {document.name}
-                                            </div>
-                                        </div>
-                                         </a>
-                                     );
-                                 }
-
                                 return (
                                     <a id={'document-' + document.key}  key={'order-document-' + document.key}>
                                         <div onClick={() => {this.downloadDocument(orderId, documentsGroup.orderItemId, document)}} className="document-link-big">
--- a/frontend/src/containers/orders/components/process/CustomerAcceptance.jsx
+++ b/frontend/src/containers/orders/components/process/CustomerAcceptance.jsx
@@ -139,6 +139,7 @@ class CustomerAcceptance extends Component {
                                activeClassName="upload-file-accept"
                                onDrop={(acceptedFiles, rejectedFiles)=>{this.uploadFile(step.idOrder, acceptedFiles, rejectedFiles)}}>
                             <h5 className="drop-zone-text">{orderTexts.labels.UPLOAD_ACCEPTANCE_LABEL}</h5>
+                            <p className="drop-zone-text">To upload multiple files, please pack the files to one zip-file and upload the zip-file</p>
                        </Dropzone>
                    </Col>
                    <Col xl="4" lg="7" md="8">
@@ -148,7 +149,7 @@ class CustomerAcceptance extends Component {
                                {
                                    customerAcceptance.documents.map((document, index) => <div key={'acceptance-documnet-' + index}>
                                        <span className="document-link">
-                                            <i className={'fa fa-file'}></i> <a download href={document.url}> {document.name} </a>
+                                            <i className={`fa fa-${document.icon}`}></i> <a download href={document.url}> {document.name} </a>
                                        </span>
                                        <span className="document-status">
                                            {document.validation} <div className={'status-icon ' + document.validation}></div>
--- a/frontend/src/containers/orders/components/process/ValidateQuestionnaire.jsx
+++ b/frontend/src/containers/orders/components/process/ValidateQuestionnaire.jsx
@@ -27,8 +27,8 @@ class ValidateQuestionnaire extends Component {
                    customerQuestionnaires.map((customerQuestionnaryAction) =>
                        <ValidateQuestionnaireItem
                            action={customerQuestionnaryAction}
-                            key={'validate-questionnaire-' + customerQuestionnaryAction.action_id}
-                            orderPackage={orderPackages.find( orderPackage => orderPackage.orderItemId === customerQuestionnaryAction.item_id)}
+                            key={'validate-questionnaire-' + customerQuestionnaryAction.actionId}
+                            orderPackage={orderPackages.find( orderPackage => orderPackage.orderItemId === customerQuestionnaryAction.orderItemId)}
                        />
                    )
                }
--- a/frontend/src/containers/orders/components/process/ValidateQuestionnaireItem.jsx
+++ b/frontend/src/containers/orders/components/process/ValidateQuestionnaireItem.jsx
@@ -19,7 +19,7 @@ class ValidateQuestionnaireItem extends Component {
    uploadFile(action,acceptedFiles, rejectedFiles) {
        if(acceptedFiles && acceptedFiles.length){
            const file = acceptedFiles[0];
-            this.props.dispatch(uploadCustomerQuestionnaire(action.order_id, action.action_id, file));
+            this.props.dispatch(uploadCustomerQuestionnaire(action.orderId, action.actionId, file));
        }

        // if(rejectedFiles && rejectedFiles.length) {
@@ -48,7 +48,7 @@ class ValidateQuestionnaireItem extends Component {
                                                <div>

                                                    <span className="document-link">
-                                                       <i className={'fa fa-file'}></i> <a download href={document.url}> {document.name} </a>
+                                                       <i className={`fa fa-${document.icon}`}></i> <a download href={document.url}> {document.name} </a>
                                                    </span>
                                                    <br />
                                                    <span className="document-status">
@@ -59,7 +59,8 @@ class ValidateQuestionnaireItem extends Component {
                                                    (action.comments && action.comments.length > 0) &&
                                                    <div>
                                                        {action.comments.map((comment, key) => <div key={'step-comment-' + document.idDocument + '-' + key} className="step-comment">
-                                                            <div>{comment}</div>
+                                                            <strong>{comment.header}</strong>
+                                                            <p>{comment.value}</p>
                                                        </div>)}
                                                    </div>
                                                }
@@ -71,6 +72,7 @@ class ValidateQuestionnaireItem extends Component {
                                                        activeClassName="upload-file-accept"
                                                        onDrop={(acceptedFiles, rejectedFiles)=>{this.uploadFile(action, acceptedFiles, rejectedFiles)}}>
                                                     <h5 className="drop-zone-text">{orderTexts.labels.SELECT_OR_DROP}</h5>
+                                                    <p className="drop-zone-text">To upload multiple files, please pack the files to one zip-file and upload the zip-file</p>
                                                </Dropzone>
                                            </Col>
                                        </Row>
@@ -79,12 +81,21 @@ class ValidateQuestionnaireItem extends Component {
                                        <Row>
                                            <Col>
                                                <span className="document-link">
-                                                   <i className={'fa fa-file'}></i> <a download href={document.url}> {document.name} </a>
+                                                   <i className={`fa fa-${document.icon}`}></i> <a download href={document.url}> {document.name} </a>
                                                </span>
                                                <br />
                                                <span className="document-status">
                                                    {action.status.replace(/-/g,' ')} <div className={'status-icon ' + action.status}></div>
                                                </span>
+                                                {
+                                                    (action.comments && action.comments.length > 0) &&
+                                                    <div>
+                                                        {action.comments.map((comment, key) => <div key={'step-comment-' + document.idDocument + '-' + key} className="step-comment">
+                                                            <strong>{comment.header}</strong>
+                                                            <p>{comment.value}</p>
+                                                        </div>)}
+                                                    </div>
+                                                }
                                            </Col>
                                        </Row>
                                    </div>
--- a/frontend/src/containers/orders/style/ProcessContainer.scss
+++ b/frontend/src/containers/orders/style/ProcessContainer.scss
@@ -181,7 +181,7 @@ $link-line-height: 1.5rem;
 .upload-file-drop-zone {
    width: 100%;
    border: 3px dashed $borderColor;
-    height: 10rem;
+    padding: 2rem;
    cursor: pointer;
    border-radius: 4px;
 }
@@ -206,7 +206,6 @@ $link-line-height: 1.5rem;

 .drop-zone-text {
    text-align: center;
-    padding: 4rem 0;
 }

 .document-link {
@@ -357,7 +356,6 @@ $link-line-height: 1.5rem;

     .drop-zone-text {
         text-align: center;
-         padding: 4rem 0;
         font-size: 1rem;
     }

--- a/frontend/src/helpers/DocumentHelper.js
+++ b/frontend/src/helpers/DocumentHelper.js
@@ -9,7 +9,8 @@ const iconTypes = {
    xls: 'file-excel-o',
    xlsx: 'file-excel-o',
    ppt: 'file-powerpoint-o',
-    pptx: 'file-powerpoint-o'
+    pptx: 'file-powerpoint-o',
+    zip: 'file-zip-o'
 };

 export const getDocumentIcon = extension => {
--- a/frontend/src/helpers/ProcessHelper.js
+++ b/frontend/src/helpers/ProcessHelper.js
@@ -1,4 +1,5 @@
 import moment from "moment";
+import {getDocumentIcon} from "./DocumentHelper";

 export const fromWiaasProcessStep = (step) => {
    return {
@@ -13,4 +14,31 @@ export const fromWiaasProcessStep = (step) => {
        shortDesc: step.short_desc,
        status: step.status,
    }
+};
+
+export const fromWiaasCustomerAcceptance = cData => {
+
+    return {
+        actionId: cData['action_id'],
+        expiration: cData.expiration,
+        declineReason: cData['decline_reason'],
+        status: cData.status,
+        documents: cData.documents ? cData.documents.map(document => {
+            document.icon = getDocumentIcon(document.extension);
+            return document;
+        }) : []
+    };
+};
+
+export const fromWiaasCustomerQuestionnaire = cData => {
+    const document = cData.document;
+    document.icon = getDocumentIcon(document.extension);
+    return {
+        actionId: cData['action_id'],
+        orderItemId: cData['item_id'],
+        document,
+        status: cData.status,
+        orderId: cData['order_id'],
+        comments: cData.comments
+    };
 };
--- a/frontend/src/mainComponents/table/WiaasTable.scss
+++ b/frontend/src/mainComponents/table/WiaasTable.scss
@@ -25,6 +25,7 @@
        font-weight: 600;
        text-align: left;
        color: #33425b;
+        word-break: break-all;
    }

    .wiass-table-small-scr-header{
@@ -50,6 +51,7 @@
        }
        .wiaas-table-col {
            padding-bottom:  0.2rem;
+            word-break: break-all;
        }
    }
 }
Author	SHA1	Message	Date
Almira Krdzic	a62de78172	fix and remove broken tests	2018-11-15 23:40:58 +01:00
Almira	14550d2ea9	Merge branch 'allign-order-table' into 'development' break long words See merge request saburly/wiaas/new-wiaas!65	2018-11-15 15:23:51 +00:00
Bilal Catic	56c171df3e	break long words	2018-11-15 14:50:02 +01:00
Bilal Catic	337f031705	Merge branch 'documents-fix' into 'development' Handle documents upload See merge request saburly/wiaas/new-wiaas!64	2018-11-15 13:44:55 +00:00
Almira Krdzic	b7be6fde42	Merge branch 'development' into documents-fix	2018-11-15 14:33:15 +01:00
Almira Krdzic	6c656a0b26	Handle order documents	2018-11-15 11:29:15 +01:00
Bilal Catic	c4d539f549	Merge branch 'documents-fix' into 'development' Documents fix See merge request saburly/wiaas/new-wiaas!63	2018-11-07 10:17:46 +00:00
Almira Krdzic	0ba27b2f1d	documents fix	2018-11-07 03:05:54 +01:00
Bilal Catic	e6b372f5d0	Merge branch 'cart-validation' into 'development' Validate that items are from the same country and catalogue See merge request saburly/wiaas/new-wiaas!61	2018-11-06 20:13:13 +00:00