| ' . $field->format_discussion_value($action_entry[$field->id]) . ' | |
| ' . $label . ' : | ' . + '' . $value . ' | ' . + '
| + + + get_status_label($current_action_step->get_status()) . ': ' . $current_action_step->get_name(); + echo '' . + ' ' . + ''; + + } else { + echo $workflow_api->get_status($action_entry); + } + ?> + + + | +|
| Suppliers | -Estimated date | -Confirmed date | +|||||||||||||||||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Suppliers | +Estimated date | +Confirmed date | ||||||
|---|---|---|---|---|---|---|---|---|
| ' . $supplier['name'] . ' | '; + echo '||||||||
| ' . $supplier['name'] . ' | '; + $estimated_date = $supplier['estimated_date'] ? date("Y-m-d", $supplier['estimated_date']) : ""; $confirmed_date = $supplier['confirmed_date'] ? date("Y-m-d", $supplier['confirmed_date']) : ""; ?>- type="date" onChange="onEstimatedDeliveryDateChange(, this.value)" value="" /> + + + type="date" + onChange="onEstimatedDeliveryDateChange(, this.value)" + value="" /> | - type="date" onChange="onConfirmedDeliveryDateChange(, this.value)" value="" /> + + + type="date" onChange="onConfirmedDeliveryDateChange(, this.value)" + value="" /> | ||||||
Tracking |
- ||||||||
| + | + Tracking: + | |||||||
| - | - placeholder="Tracking number" value="" /> | -- placeholder="Tracking URL" value="" /> | -- | + | + + + placeholder="Tracking number" value="" /> + + + placeholder="Tracking URL" value="" /> + + class="button" + onClick="saveTrackingInfo(event, )" + value="SAVE"> + + class="button" + onClick="deleteTrackingInfo(event, )" value="REMOVE" + > + | |||
| + + class="button" + id= onClick="addAdditionalTrackingInfo(event)" + value="Add new tracking info"> + | - | |||||||
Earliest installation date : |
- - | |||||||
Earliest installation date : |
+ + + | +|||||||
Choose if this form will be used as process form or action form.
' . + 'Process form defines order delivery process workflow.
' . + 'Action form defines custom order data that is collected from delivery process participants.
' + )); + + + ?> +Choose action code for action form.
' + )); + + + $this->settings_checkbox_and_select(array( + 'checkbox' => array( + 'label' => esc_html__( 'Automatic', 'wiaas' ), + 'name' => 'automatic_action_entries_enabled', + 'default_value' => '0', + ), + 'select' => array( + 'name' => 'automatic_action_entries_type', + 'choices' => array( + array( + 'value' => 'single', + 'label' => esc_html__( 'Single entry', 'wiaas' ), + ), + array( + 'value' => 'bundle', + 'label' => esc_html__( 'Entry per bundle', 'wiaas' ), + ) + ), + 'after_select' => 'Automatic entries can be created once per order or per every bundle in order.
' . + 'Automatic entry will not be created if any required field cannot be populated.
', + ) + )); + + return; + } + + + $this->settings_select(array( + 'name' => 'delivery_country', + 'choices' => array( + array( 'value' => 'se', 'label' => 'Sweden' ), + array( 'value' => 'dk', 'label' => 'Denmark' ), + array( 'value' => 'fi', 'label' => 'Finland' ) + ), + 'after_select' => 'Choose country for which this process is defined.
' + )); + } +} \ No newline at end of file diff --git a/backend/app/plugins/wiaas/includes/delivery-process/class-wiaas-delivery-process-step-assignee.php b/backend/app/plugins/wiaas/includes/delivery-process/class-wiaas-delivery-process-step-assignee.php new file mode 100644 index 0000000..876c924 --- /dev/null +++ b/backend/app/plugins/wiaas/includes/delivery-process/class-wiaas-delivery-process-step-assignee.php @@ -0,0 +1,186 @@ + __( 'Order', 'wiaas' ), + 'choices' => array( + array( + 'value' => 'role|administrator', // allow global administrator role here since it is only one + 'label' => __('Administrator', 'wiaas') + ) + ), + ) + ); + + // add administrator users + $args = array( + 'number' => 1000, + 'orderby' => 'display_name', + 'role' => 'administrator' + ); + $accounts = get_users( $args ); + $account_choices = array(); + foreach ( $accounts as $account ) { + $account_choices[] = array( 'value' => 'user_id|' . $account->ID, 'label' => $account->display_name ); + } + + $choices[] = array( + 'label' => __( 'Users', 'gravityflow' ), + 'choices' => $account_choices, + ); + + // append field choices + foreach ($old_choices as $old_choice) { + + if ($old_choice['label'] === 'Fields') { + + $choices[] = $old_choice; + break; + } + } + + return $choices; + } + + + /** + * Handle order level assignees for delivery process step + * + * @param $assignees + * + * @param Gravity_Flow_Step $step + * + * @return array + */ + public static function maybe_handle_order_organization_assignees($assignees, Gravity_Flow_Step $step) { + + $mapped_assignees = array(); + + $order_id = self::get_order_id_for_step($step); + + $order = wc_get_order($order_id); + + foreach ($assignees as $assignee) { + + if (strpos($assignee->get_type(), 'wiaas_installation_') !== false) { + + $item_id = $assignee->get_id(); + + $item = $order->get_item($item_id); + + $organization_id = $item['wiaas_supplier_organization_id']; + + $user_ids = wiaas_get_organization_user_ids($organization_id); + + if (empty($user_ids)) { + + continue; + } + + $user_id = $user_ids[0]; + + $mapped_assignees[] = $step->get_assignee( array( + 'id' => $user_id, + 'type' => 'user_id', + 'editable_fields' => $assignee->get_editable_fields() + ) ); + + continue; + } + + if ($assignee->get_type() === 'wiaas_order_role') { + + + $order_role = $assignee->get_id(); + + if ($order_role === 'customer') { + + $customer_user_id = $order->get_customer_id(); + + // for now assign only customer that create order + // check if all customer organization users should be able to see order step + + $mapped_assignees[] = $step->get_assignee( array( + 'id' => $customer_user_id, + 'type' => 'user_id', + 'editable_fields' => $assignee->get_editable_fields() + ) ); + + continue; + } + } + + $mapped_assignees[] = $assignee; + } + + return $mapped_assignees; + } + + + /** + * Retrieve order id for delivery process step + * + * @param Gravity_Flow_Step $step + * + * @return bool|int Order id on success, false if step does not have associated order id + * + */ + public static function get_order_id_for_step(Gravity_Flow_Step $step) { + + $entry = $step->get_entry(); + + // if order is present in entry metadata use that value + if (! empty($entry['wiaas_delivery_order_id'])) { + + return absint($entry['wiaas_delivery_order_id']); + } + + // try getting order id from order field + $form = GFAPI::get_form($entry['form_id']); + + $order_fields = GFCommon::get_fields_by_type($form, array( 'wiaas_order')); + + if (! empty($order_fields)) { + + $order_field = $order_fields[0]; // there should only be one order field per entry + + return absint($entry[$order_field->id]); + } + + return false; + } +} + +Wiaas_Delivery_Process_Step_Assignee::init(); diff --git a/backend/app/plugins/wiaas/includes/delivery-process/class-wiaas-delivery-process-step.php b/backend/app/plugins/wiaas/includes/delivery-process/class-wiaas-delivery-process-step.php index 8c5b478..6edcc9e 100644 --- a/backend/app/plugins/wiaas/includes/delivery-process/class-wiaas-delivery-process-step.php +++ b/backend/app/plugins/wiaas/includes/delivery-process/class-wiaas-delivery-process-step.php @@ -7,30 +7,12 @@ class Wiaas_Delivery_Process_Step extends Gravity_Flow_Step { * @var string */ public $_step_type = 'wiaas_delivery_step'; - - private static $delivery_action_form_title_prefix = 'DELIVERY ACTION TYPE:'; - - private static $delivery_action_types = array( - 'DELIVERY ACTION TYPE: Customer acceptance' => 'customer-acceptance', - 'DELIVERY ACTION TYPE: Validate Questionnaire' => 'validate-questionnaire', - 'DELIVERY ACTION TYPE: Manual' => 'manual', - 'DELIVERY ACTION TYPE: Schedule meeting' => 'schedule-meeting' - ); - - public static function get_delivery_action_types() { - return array_keys(self::$delivery_action_types); - } - - public static function get_delivery_action_type_prefix() { - return self::$delivery_action_form_title_prefix; - } - /** * Returns label for Wiass Delivery Process Step * @return string */ public function get_label() { - return esc_html__( 'Wiaas Delivery Step', 'wiaas' ); + return esc_html__( 'Delivery Step', 'wiaas' ); } /** @@ -41,12 +23,12 @@ class Wiaas_Delivery_Process_Step extends Gravity_Flow_Step { $settings_api = $this->get_common_settings_api(); - $forms = $this->get_target_forms_choices(); + $forms = $this->get_action_forms_choices(); $form_choices[] = array( 'label' => esc_html__( 'Select a Form', 'wiaas' ), 'value' => '' ); foreach ( $forms as $form ) { - $form_choices[] = array( 'label' => $form->title, 'value' => $form->id ); - } + $form_choices[] = array( 'label' => $form['title'], 'value' => $form['id'] ); + } $settings = array( 'title' => esc_html__( 'Wiaas Delivery Step', 'wiaas' ), @@ -71,13 +53,56 @@ class Wiaas_Delivery_Process_Step extends Gravity_Flow_Step { 'type' => 'select', 'onchange' => "jQuery(this).closest('form').submit();", 'choices' => $form_choices, - ), + ) ), ); return $settings; } + public function start() { + + parent::start(); + + $this->update_step_status('pending'); + + return false; + } + + public function evaluate_status() { + + return $this->get_status(); + } + + public function get_status_label($status) { + + $label = parent::get_status_label($status); + + if (empty($label)) { + + $label = __('Not started', 'wiaas'); + } + + return $label; + } + + public function update_step_status($status = false) { + + if ($status === 'cancelled' && $admin_action = rgpost( 'wiaas_delivery_process_navigation_action' )) { + + list( $base_admin_action, $step_id ) = rgexplode( '|', $admin_action, 2 ); + + $next_step = gravity_flow()->get_next_step($this, $this->get_entry(), $this->get_form()); + // going to next step + if ($base_admin_action === 'send_to_step' && $next_step && $next_step->get_id() == $step_id) { + + $status = 'complete'; + } + } + + parent::update_step_status($status); + } + /** * Process Wiass Delivery Process Step * @@ -90,81 +115,77 @@ class Wiaas_Delivery_Process_Step extends Gravity_Flow_Step { $entry = $this->get_entry(); $target_form = GFAPI::get_form( $this->target_form_id ); - # if target form is not valid just finish the step + # if target form is not set we are done if (!$target_form) { - return true; + // return false since we wait for admin to process the step + return false; } - # create new entry for target form with populated value for customer-id from parent entry - $new_entry = array( - 'form_id' => $this->target_form_id, - 'wiaas_delivery_process_id' => $this->get_entry_id(), - 'wiaas_delivery_order_id' => $entry['wiaas_delivery_order_id'], - 'wiaas_delivery_step_name' => $this->get_name(), - ); + $delivery_settings = rgar($target_form, 'wiaas_delivery_process'); - $customer_id_value = null; + if (! $delivery_settings['automatic_action_entries_enabled']) { - if ( is_array( $form['fields'] ) ) { - foreach ( $form['fields'] as $field ) { - if (GFCommon::get_label( $field ) === 'customer-id') { - $customer_id_value = $entry[$field->id]; - break; - } - } + return false; + } + + $action_entries_ids = gform_get_meta($this->get_entry_id(), 'wiaas_delivery_step_' . $this->get_id() . '_action_entry_ids'); + + // if action entries present this step is reprocessing and we should not be creating new action entries + if (! empty($action_entries_ids)) { + // return false since we wait for admin to process the step + return false; } - if ( is_array( $target_form['fields'] ) ) { - foreach ( $target_form['fields'] as $field ) { - if (GFCommon::get_label( $field ) === 'customer-id') { - $new_entry[$field->id] = $customer_id_value; - break; - } - } + // create new entries for step action forms + $order_field = GFCommon::get_fields_by_type($form, 'wiaas_order')[0]; + $order_id = empty($order_field) ? null : absint($entry[$order_field->id]); + + // if process has not order we cannot create actions + if (empty($order_id)) { + // return false since we wait for admin to process the step + return false; } - $entry_id = GFAPI::add_entry( $new_entry ); - if ( is_wp_error( $entry_id ) ) { - $this->log_debug( __METHOD__ .'(): failed to add entry' ); - } else { - // store entry id - gform_update_meta($this->get_entry_id(), 'wiaas_delivery_step_' . $this->get_id() .'_entry_id', $entry_id); + $delivery_settings = rgar($target_form, 'wiaas_delivery_process'); + + switch ($delivery_settings['automatic_action_entries_type']) { + + case 'single': + $action_entries_ids = $this->_create_single_action_entry($target_form, $order_id); + break; + case 'bundle': + $action_entries_ids = $this->_create_per_bundle_action_entries($target_form, $order_id); } + gform_update_meta($this->get_entry_id(), 'wiaas_delivery_step_' . $this->get_id() . '_action_entry_ids', $action_entries_ids); + $note = $this->get_name() . ': ' . esc_html__( 'started.', 'wiaas' ); $this->add_note( $note ); - # return false since we wait for workflow of target entry to be complete first + // return false since we wait for admin to process the step return false; } - /** - * Evaluates current step status based on target form entry status - * - * If target form entry has associated workflow current step will complete its status - * only when target form entry workflow is completed - * @return string - */ - public function status_evaluation() { + public function workflow_detail_box($form, $args) { + parent::workflow_detail_box($form, $args); - # retrieve target form entry to check its workflow status - $target_form_entry = $this->get_target_form_entry(); + $target_form = GFAPI::get_form( $this->target_form_id ); - # if there is no target form entry just complete the step - if(!$target_form_entry) { - return 'complete'; + if (empty( $target_form)) { + + return; } - # retrieve target form entry workflow status - $api = new Gravity_Flow_API( $this->target_form_id ); - $status = $api->get_status($target_form_entry); + ?> +