Merge branch 'fix-image-style' into 'development'

Fix banner image style (Remove Co-Market from customer interface)

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

(cherry picked from commit 392b113427)

3ce531ca Fix banner image style
d15cb6a2 fix image size

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-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-cart.php

@@ -473,8 +473,8 @@ class Wiaas_Cart {
 			'_wiaas_supplier_organization_id',
 			'_wiaas_product_price',
 			'_wiaas_earliest_installation_additional_days',
-			'wiaas_installation',
-			'wiaas_installation_date'
+			'_wiaas_installation',
+			'_wiaas_installation_date'
 		) );
 	}
 

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

@@ -436,7 +436,7 @@ class Wiaas_Order {
 		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) . ' days', $earliest_installation_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);
@@ -475,7 +475,6 @@ class Wiaas_Order {
 		$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(
@@ -487,8 +486,7 @@ class Wiaas_Order {
 		}
 
 		if (!empty($commercial_lead_organization_info)) {
-
-			$commercial_lead_organization_info['id'] = $commercial_lead_organization_info;
+			$commercial_lead_organization_info['id'] = $commercial_lead_org_id;
 
 			$data['commercial_lead'] = $commercial_lead_organization_info;
 		}

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

@@ -88,12 +88,15 @@ class Wiaas_Delivery_Process_Step_Assignee {
 
 		$mapped_assignees = array();
 
-		$order_id = self::get_order_id_for_step($step);
+		$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();
@@ -120,11 +123,15 @@ class Wiaas_Delivery_Process_Step_Assignee {
 				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();
@@ -157,7 +164,7 @@ class Wiaas_Delivery_Process_Step_Assignee {
 	 * @return bool|int Order id on success, false if step does not have associated order id
 	 *
 	 */
-	public static function get_order_id_for_step(Gravity_Flow_Step $step) {
+	private static function _get_order_id_for_step(Gravity_Flow_Step $step) {
 
 		$entry = $step->get_entry();
 

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

@@ -23,7 +23,7 @@ class Wiaas_Delivery_Process_Step extends Gravity_Flow_Step {
 
 		$settings_api = $this->get_common_settings_api();
 
-		$forms = $this->get_action_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 ) {
 
@@ -86,8 +86,18 @@ class Wiaas_Delivery_Process_Step extends Gravity_Flow_Step {
         return $label;
     }
 
+	/**
+     * 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 );
@@ -104,10 +114,10 @@ class Wiaas_Delivery_Process_Step extends Gravity_Flow_Step {
     }
 
 	/**
-	 * Process Wiass Delivery Process Step
+     *
+	 * 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() {
 
@@ -198,28 +208,22 @@ class Wiaas_Delivery_Process_Step extends Gravity_Flow_Step {
 		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_action_forms_choices() {
-
-		return Wiaas_Delivery_Process_Action::get_action_forms();
-	}
-
-
-	/**
-	 * 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);
-	}
-
-
 	private function _create_single_action_entry($target_form, $order_id) {
 
 		$action_entries_ids = array();
@@ -248,6 +252,14 @@ class Wiaas_Delivery_Process_Step extends Gravity_Flow_Step {
 	}
 
 
+	/**
+     * Create action form entries for every bundle in order to trigger subworkflows
+     *
+	 * @param $target_form
+	 * @param $order_id
+	 *
+	 * @return array
+	 */
 	private function _create_per_bundle_action_entries($target_form, $order_id) {
 
 		$action_entries_ids = array();

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

@@ -306,30 +306,16 @@ class Wiaas_Order_Fields {
 		}
 	}
 
-	public static function get_value_from_order_field($entry, $field) {
-
-	    switch ($field->type) {
-
-		    case 'wiaas_order_bundle':
-			    $value = $entry[$field->id];
-			    list ($order_id, $item_id) = explode('|', $value);
-
-			    if ( ! empty($order_id) && ! empty($item_id)) {
-
-			        return array(
-			            'id' => $item_id,
-                        'name' => $field->get_selected_bundle_display_name($value)
-                    );
-                }
-
-                return null;
-
-            case '':
-
-        }
-    }
-
 
+	/**
+     * 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']) ||
@@ -430,9 +416,9 @@ class Wiaas_Order_Fields {
 		            }
 
 		            // installation is already selected
-		            if (!empty($bundle_item->get_meta('wiaas_installation', true))) {
+		            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);
+			            $entry[(string) $field->id] = 'wiaas_installation_' . $order->get_id() . '|' . $bundle_item->get_meta('_wiaas_installation', true);
 
 			            continue;
                     }
@@ -461,6 +447,7 @@ class Wiaas_Order_Fields {
 		                $installation_item = $installation_items[0];
 
 	                    $entry[(string) $field->id] = 'wiaas_installation_' . $order->get_id() . '|' . $installation_item->get_id();
+
                     } else if (count($installation_items) > 1) {
 
 		                // force admin to select installation

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

@@ -20,7 +20,8 @@ class Wiaas_Document_Download  {
 	}
 
 	/**
-	 * Handle download for order documents by gravity flow steps
+	 * Handle download of order documents by gravity flow steps for wordpress administration interface
+	 *
 	 */
 	public static function admin_gf_order_document_download() {
 
@@ -44,6 +45,8 @@ class Wiaas_Document_Download  {
 	}
 
 	/**
+	 * Handle document download for wordpress administration interface
+	 *
 	 * Since only REST api uses JWT Authentication this endpoint will work only for users
 	 * that are logged in directly to wordpress
 	 */
@@ -84,7 +87,8 @@ class Wiaas_Document_Download  {
 	}
 
 	/**
-	 * Download order other document (not binded to any bundle)
+	 * Download order other document (not related to any order item)
+	 *
 	 * @param int $order_id
 	 * @param string $document_key
 	 */
@@ -113,8 +117,6 @@ class Wiaas_Document_Download  {
 
 		$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 ) );
 		}

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'];
-	}
-
-
-}

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']);
-    }
-}

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

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

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']);
-	}
 }

backend/config/application.php

@@ -76,6 +76,7 @@ define('SENDGRID_FROM_NAME', env('WP_SENDGRID_FROM_NAME' ?: 'Wiaas'));
  * Wiaas Env variables
  */
 define('WIAAS_CUSTOMER_INTERFACE', env('WIAAS_CUSTOMER_INTERFACE') ?: WP_HOME);
+define('WIAAS_SUPPORT_EMAIL', env('WIAAS_SUPPORT_EMAIL') ?: 'support@co-ideation.com');
 
 /**
  * Custom Settings
@@ -89,4 +90,4 @@ define('DISALLOW_FILE_EDIT', true);
  */
 if (!defined('ABSPATH')) {
 	define('ABSPATH', $webroot_dir . '/wp/');
-}
+}

frontend/src/actions/login/authActions.js

@@ -165,6 +165,13 @@ export const getModules = () => {
                         url: 'cart',
                         isInMenu: '0'
                     },
+                    {
+                        id: '20',
+                        name: 'HelpDesk',
+                        menuName: 'Helpdesk',
+                        url: 'helpdesk',
+                        isInMenu: '0'
+                    },
                     {
                         id: '14',
                         name: 'ProfileSettings',

frontend/src/actions/orders/processActions.js

@@ -325,12 +325,13 @@ export const setSupportMessage = (message) => ({
     supportText: message
 });
 
-export const sendSupportMail = (orderInfo, orderPackages, supportText) => {
+export const sendSupportMail = (orderInfo, orderPackages, support_text) => {
+    let id = orderInfo.id;
     return dispatch => {
         return htmlClient.fetch({
-                url: `${API_SERVER}/orders/api/sendSupportMail`,
+                url: `${API_SERVER}/wp-json/wiaas/support/send-support-email`,
                 method: 'post',
-                data: {orderInfo, orderPackages, supportText}
+                data: {id, support_text}
             })
             .then(response => {
                 if (typeof response.data !== 'undefined' && 'messages' in response.data) {

frontend/src/config.js

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

frontend/src/constants/appContainers.js

@@ -4,6 +4,7 @@ import CoMarketContainer from '../containers/coMarket/CoMarketContainer.jsx';
 import CartContainer from '../containers/cart/CartContainer.jsx';
 import TermsContainer from '../containers/terms/TermsContainer.jsx';
 import ProfileSettingsContainer from '../containers/profileSettings/ProfileSettingsContainer.jsx';
+import HelpDeskContainer from '../containers/HelpDesk/HelpDeskContainer.jsx';
 
 export const MainContainers = {
      Dashboards: {
@@ -22,6 +23,10 @@ export const MainContainers = {
          container: CartContainer,
          params: []
      },
+     HelpDesk:{
+         container: HelpDeskContainer,
+         params: []
+     },
      Terms: {
          container: TermsContainer,
          params: []

frontend/src/containers/HelpDesk/HelpDeskContainer.jsx

@@ -0,0 +1,11 @@
+import React, {Component} from 'react';
+import './style/HelpDesk.css';
+
+class HelpDeskContainer extends Component {
+    render() {
+        
+        return (<iframe src='https://wiaas.freshservice.com/support/login'></iframe>);
+    }
+}
+
+export default HelpDeskContainer;

frontend/src/containers/HelpDesk/style/HelpDesk.scss

@@ -0,0 +1,6 @@
+iframe {
+    display: block;
+    border: none;
+    width: 100%;
+    height: 100vh;
+}

frontend/src/containers/coMarket/CoMarketPackagesContainer.jsx

@@ -28,12 +28,12 @@ class CoMarketPackagesContainer extends Component {
                 <Row>
                     <Col xl="8" lg="8" md="8" sm="12" xs="12">
                         <WiaasBox id="co-market-big-commercial">
-                              <img className="description-photo" src="https://res.cloudinary.com/co-market/image/upload/v1524472688/Co-Market/CoMarketStartsida_MAIN.jpg" alt="big-commercial"/>
+                              <img className="description-photo" src="/static/img/WIAAS_Market_banner.jpg" alt="big-commercial"/>
                         </WiaasBox>
                     </Col>
                     <Col xl="4" lg="4" md="4" sm="12" xs="12">
                         <WiaasBox id="co-market-commercials">
-                            <img alt="wiaas commercial" src="https://res.cloudinary.com/co-market/image/upload/v1524472688/Co-Market/CoMarketStartsida_OFFERCoor.jpg" className="commercial-photo"/>
+                            <img alt="wiaas commercial" src="/static/img/WIAAS_Market_SMO_infobox.jpg" className="commercial-photo"/>
                         </WiaasBox>
                     </Col>
                 </Row>

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

@@ -131,7 +131,6 @@
 }
 
 #co-market-big-commercial{
-    background: $whiteColor;
     text-align: center;
 
     .ricoh-text {
@@ -144,13 +143,24 @@
 }
 
 #co-market-commercials {
-    background: $whiteColor;
-
     .commercial-photo {
         width: 100%;
     }
 }
 
+@media (min-width: 768px) {
+
+    #co-market-commercials {
+        position: relative;
+
+        .commercial-photo {
+            position: absolute;
+            width: 100%;
+            height: 100%;
+        }
+    }
+}
+
 #co-market-catalog {
     .filter-name {
         margin-top: 0.4rem;

frontend/src/containers/orders/components/OrderInfo.jsx

@@ -80,7 +80,7 @@ class OrderInfo extends Component {
                     <Col xl="2">
                         <div>
                             <div className="subtitle"><h6>{orderTexts.labels.REFERENCE}:</h6></div>
-                            <span>{orderInfo.reference || '-'}</span>
+                            <span className="reference">{orderInfo.reference || '-'}</span>
                         </div>
                         <div>
                             <div className="subtitle"><h6>{orderTexts.labels.BID}:</h6></div>
@@ -139,7 +139,7 @@ class OrderInfo extends Component {
                     <Col xl="2">
                         <div>
                             <div className="subtitle"><h6>{orderTexts.labels.PROJECT}:</h6></div>
-                            <span>{orderInfo.projectName || '-'}</span>
+                            <span className="project-name">{orderInfo.projectName || '-'}</span>
                         </div>
                         
                         <div className="terms-link">

frontend/src/containers/orders/style/ProcessContainer.scss

@@ -7,6 +7,14 @@ $link-line-height: 1.5rem;
         margin-top: 0.5rem;
     }
 
+    .reference{
+        word-break: break-all;
+    }
+
+    .project-name{
+        word-break: break-all;
+    }
+
     .info-color {
         margin-top: 0.2rem;
         padding-left: 0.2rem;

frontend/src/mainComponents/menu/Menu.jsx

@@ -84,6 +84,13 @@ class Menu extends Component {
                                 )
                             }
                         </Nav>
+                        <Nav className="nav-btn-cart navbar-right" navbar>
+                            <NavItem 
+                                id="nav-button-helpdesk" 
+                                className={(this.props.activeModule === 'helpdesk') ? "navbar-button active" : "navbar-button"}>
+                                <NavLink tag={Link} to="/helpdesk">Helpdesk</NavLink>
+                            </NavItem>
+                        </Nav>
                         <Nav className="nav-btn-cart navbar-right" navbar>
                             <NavItem id="nav-button-cart" className="navbar-button">
                                 <NavLink tag={Link} to="/cart">

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