senaduka/old-new-wiaas
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge branch 'package-details' into 'master'

Browse Source 
Package details

See merge request saburly/wiaas/new-wiaas!21
This commit was merged in pull request #21.
This commit is contained in:
Bilal Catic
2018-09-12 19:52:34 +00:00
parent 9e741008eb 3b0a1c152a
commit d4c75dcf65
67 changed files with 3750 additions and 1127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
backend/app/plugins/wiaas/assets/css/package.css
View File

@@ -1,5 +1,5 @@
#wiaas_package_price { #wiaas_package_price .wc-metaboxes-wrapper {
padding: 20px; padding: 10px;
} }
#wiaas_package_price label { #wiaas_package_price label {
@@ -12,7 +12,7 @@
} }
#wiaas_package_price_controls { #wiaas_package_price_controls {
float: right; border: none;
} }
#wiaas_package_price_controls > select { #wiaas_package_price_controls > select {
@@ -90,3 +90,34 @@
font-size: 12px; font-size: 12px;
height: 36px; height: 36px;
} }
#wiaas_linked_packages div.wc-metaboxes-wrapper {
float: none;
width: 100%;
padding: 10px 0;
}
#wiaas_linked_packages .toolbar {
border: none;
}
#wiaas_linked_packages .expand-close {
float: right;
}
#wiaas_package_option_groups_list {
margin: 9px 12px;
border: 1px solid #eee;
border-radius: 3px;
}
#wiaas_package_option_groups_list label {
float: none;
margin: 0;
width: auto;
}
#wiaas_package_option_groups_list .wiaas_option_group h3 {
background-color:#F9F9F9;
}

22
backend/app/plugins/wiaas/includes/admin/class-wiaas-admin-package.php Normal file
View File

@@ -0,0 +1,22 @@
<?php
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
}
class Wiaas_Admin_Package {
public static function init() {
add_action( 'admin_enqueue_scripts', array(__CLASS__, 'enqueue_scripts'), 100 );
require_once dirname( __FILE__ ) . '/package/class-wiaas-admin-linked-packages.php';
require_once dirname( __FILE__ ) . '/package/class-wiaas-admin-package-types.php';
}
public static function enqueue_scripts() {
$plugin_url = untrailingslashit( plugins_url( '/', WIAAS_FILE ) );
wp_enqueue_style( 'wiaas_admin_styles', $plugin_url . '/assets/css/package.css' );
}
}
Wiaas_Admin_Package::init();

19
backend/app/plugins/wiaas/includes/admin/class-wiaas-admin-pricing.php Normal file
View File

@@ -0,0 +1,19 @@
<?php
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
}
/**
* Class Wiaas_Admin_Pricing
*/
class Wiaas_Admin_Pricing {
public static function init() {
require_once dirname( __FILE__ ) . '/pricing/class-wiaas-admin-product-pricing.php';
require_once dirname( __FILE__ ) . '/pricing/class-wiaas-admin-package-pricing.php';
}
}
Wiaas_Admin_Pricing::init();

168
backend/app/plugins/wiaas/includes/admin/package/class-wiaas-admin-linked-packages.php Normal file
View File

@@ -0,0 +1,168 @@
<?php
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
}
/**
* Class Wiaas_Admin_Linked_Packages
*/
class Wiaas_Admin_Linked_Packages {
public static function init() {
add_action( 'woocommerce_product_data_tabs', array( __CLASS__, 'package_data_tabs' ) );
add_action( 'woocommerce_product_data_panels', array( __CLASS__, 'package_data_panel' ) );
add_action( 'wp_ajax_wiaas_json_search_addons', array(__CLASS__, 'json_search_addons') );
add_action( 'wp_ajax_wiaas_json_search_options', array(__CLASS__, 'json_search_options') );
add_action( 'wp_ajax_wiaas_create_empty_option_group', array(__CLASS__, 'create_empty_option_group') );
add_action( 'woocommerce_process_product_meta', array( __CLASS__, 'process_meta_box' ));
}
/**
* Redirects default woocommerce linked packages tab to wiaas linked packages tab
* @param $tabs
*
* @return array
*/
public static function package_data_tabs($tabs) {
$tabs[ 'linked_product' ]['label'] = __( 'Linked Packages', 'wiaas' );
$tabs[ 'linked_product' ]['target'] = 'wiaas_linked_packages';
$tabs[ 'linked_product' ]['class'] = array('show_if_bundle', 'hide_if_simple');
return $tabs;
}
/**
* Renders wiaas linked packages tab
*/
public static function package_data_panel() {
global $post;
$package = wc_get_product( $post->ID );
$addons = Wiaas_Package_Addon::get_package_addons($package);
$option_groups = Wiaas_Package_Option_Groups::get_package_option_groups($package);
include 'views/html-linked-packages.php';
}
/**
* Implements ajax search for package addons
*/
public static function json_search_addons() {
self::_json_search_packages('add_on');
}
/**
* Implements ajax searc for package options
*/
public static function json_search_options() {
self::_json_search_packages('option');
}
/**
* Creates and renders new optional packages group
*/
public static function create_empty_option_group() {
$group = array(
'name' => 'Untitled',
'id' => uniqid('option_'),
'default' => false,
'options' => array()
);
?>
<script type="text/javascript">
$( document.body ).trigger( 'wc-enhanced-select-init' );
</script>
<?php
$group_options = isset($group['options']) ? $group['options'] : array();
$id = $group['id'];
include 'views/html-package-options-group.php';
?>
<?php
die();
}
/**
* Saves posted linked packages data
*
* @param $package_id
*/
public static function process_meta_box($package_id) {
$package = wc_get_product($package_id);
// Handle linked addons
$addons_ids = isset( $_POST['wiaas_addon_packages'] ) ?
array_filter( array_map( 'intval', (array) $_POST['wiaas_addon_packages'] ) ) :
array();
Wiaas_Package_Addon::set_package_addons(
$package,
$addons_ids);
// Handle linked options
$posted_option_groups = isset( $_POST['wiaas_option_groups'] ) ? $_POST['wiaas_option_groups'] : array();
$option_groups = array();
foreach ($posted_option_groups as $id => $posted_option_group) {
$option_group = array(
'id' => $posted_option_group['id'],
'name' => $posted_option_group['name'],
'default' => $posted_option_group['default'],
'options' => array()
);
$option_group['options'] = isset( $posted_option_group['options'] ) ?
array_filter( array_map( 'intval', (array) $posted_option_group['options'] ) ) :
array();
$option_groups[] = $option_group;
}
Wiaas_Package_Option_Groups::set_package_option_groups(
$package,
$posted_option_groups);
}
/**
* Implements search for packages of provided type
* @param $package_type
*/
private static function _json_search_packages($package_type) {
check_ajax_referer( 'search-products', 'security' );
$term = wc_clean( empty( $term ) ? wp_unslash( $_GET['term'] ) : $term );
if ( empty( $term ) ) {
wp_die();
}
$data_store = WC_Data_Store::load( 'product' );
$ids = $data_store->search_products( $term );
$packages= array_filter( array_map( 'wc_get_product', $ids ), 'wc_products_array_filter_readable' );
$result = array();
foreach ( $packages as $package ) {
if (Wiaas_Package_Type::get_package_type($package->get_id()) === $package_type) {
$result[ $package->get_id() ] = rawurldecode( $package->get_formatted_name() );
}
}
wp_send_json( $result );
}
}
Wiaas_Admin_Linked_Packages::init();

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

@@ -1,356 +0,0 @@
<?php
/**
* Class Wiaas_Package_Pricing
*/
class Wiaas_Admin_Package_Pricing {
public static function init() {
add_action( 'admin_enqueue_scripts', array(__CLASS__, 'enqueue_scripts'), 100 );
add_action( 'wp_ajax_create_empty_pricing_rule', array(__CLASS__, 'create_empty_pricing_rule') );
add_action( 'woocommerce_product_data_tabs', array( __CLASS__, 'package_data_tabs' ) );
add_action( 'woocommerce_product_data_panels', array( __CLASS__, 'package_data_panel' ) );
add_action( 'woocommerce_process_product_meta', array( __CLASS__, 'process_meta_box' ), 1, 2 );
}
public static function enqueue_scripts() {
$plugin_url = untrailingslashit( plugins_url( '/', WIAAS_FILE ) );
wp_enqueue_style( 'wiaas_admin_styles', $plugin_url . '/assets/css/package.css' );
}
public static function create_empty_pricing_rule() {
$pay_type = $_POST['pay_type'];
$pricing_rule_sets = array();
$pricing_rule_sets[ $pay_type ] = Wiaas_Package_Pricing::get_empty_pricing_rule();
self::_render_pricing_rules( $pricing_rule_sets );
}
public static function package_data_tabs($tabs) {
$tabs[ 'bundled_packages_price' ] = array(
'label' => __( 'Pricing', 'wiaas' ),
'target' => 'wiaas_package_price',
'class' => array( 'show_if_bundle', 'bundled_package_tab' ),
'priority' => 50
);
return $tabs;
}
public static function package_data_panel() {
global $post;
$package = wc_get_product( $post->ID );
$pricing_rules = Wiaas_Package_Pricing::get_package_prices($package);
?>
<div id="wiaas_package_price" class="panel woocommerce_options_panel wc_gte_30">
<div id="wiaas_package_pricing_rules" data-setindex="<?php echo count( $pricing_rules ); ?>">
<?php self::meta_box_javascript(); ?>
<?php self::_render_pricing_rules( $pricing_rules ); ?>
</div>
<?php self::_render_pricing_controls( $pricing_rules ); ?>
<div class="clear"></div>
</div>
<?php
}
private static function _render_pricing_rules( $pricing_rule_sets ) {
$available_pay_types = Wiaas_Package_Pricing::get_available_pay_types();
foreach ( $pricing_rule_sets as $name => $pricing_rule_set ) {
$pay_type = $available_pay_types[$name];
?>
<div id="wiaas-pricing-rule-<?php echo $name; ?>" class="wiaas-pricing-rule">
<div class="section">
<h4 class="first"><?php echo $pay_type['title']; ?>
<a href="#" data-name="<?php echo $name; ?>"
class="delete_wiaas_pricing_rule">
REMOVE
</a>
</h4>
</div>
<div class="clear"></div>
<table>
<tbody>
<tr>
<td class="wiaas_label_container">
<?php _e( 'Minimal fixed price:', 'wiaas' ); ?>
</td>
<td>
<input
id="wiaas_minimal_fixed_price_<?php echo $name; ?>"
data-name="<?php echo $name; ?>"
name="wiaas_pricing_rules[<?php echo $name; ?>][minimal_fixed_price]"
value="<?php echo $pricing_rule_set['minimal_fixed_price'] ?>"
type="text" />
</td>
<td></td>
</tr>
<?php self::_render_pricing_rule_recurrent_price($name, $pay_type, $pricing_rule_set) ?>
<?php self::_render_pricing_rule_principal_amount($name, $pay_type, $pricing_rule_set) ?>
<?php self::_render_pricing_rule_services_price($name, $pay_type, $pricing_rule_set) ?>
<tr>
<td class="wiaas_label_container">
<?php _e( 'Max contract period:', 'wiaas' ); ?>
</td>
<td>
<span id="wiaas_max_contract_period_<?php echo $name; ?>">
<?php echo $pay_type['max_contract_period'] . ' ' . $pay_type['period_unit'] ?>
</span>
</td>
<td></td>
</tr>
</tbody>
</table>
</div>
<?php
}
}
private static function _render_pricing_rule_services_price($name, $pay_type, $pricing_rule) {
$label = 'Minimal services and support price ';
if ($pay_type['services_contract_period'] > 0) {
$label .= '(' . $pay_type['services_contract_period'] . ' ' . $pay_type['period_unit'] . ')';
} else {
$label .= '(Unbound)';
}
?>
<tr>
<td class="wiaas_label_container">
<?php _e( $label . ':', 'wiaas' ); ?>
</td>
<td class="wiaas_input_container">
<input
id="wiaas_minimal_services_price_<?php echo $name; ?>"
class="wiaas_minimal_services_price"
data-name="<?php echo $name; ?>"
data-period="<?php echo $pay_type['services_contract_period']; ?>"
name="wiaas_pricing_rules[<?php echo $name; ?>][minimal_services_price]"
value="<?php echo $pricing_rule['minimal_services_price'] ?>"
type="text" />
</td>
<td>
<span style="line-height: 28px; margin-left: 10px;">
<?php echo ' / ' . $pay_type['period_unit'] ?>
</span>
</td>
</tr>
<?php
if ($pay_type['services_contract_period'] > 0) {
?>
<tr>
<td></td>
<td>Final total:</td>
<td>
<span id="wiaas_minimal_services_price_<?php echo $name; ?>_final">
<?php echo round(
$pricing_rule['minimal_services_price'] * $pay_type['services_contract_period'],
2) ?>
</span>
</td>
</tr>
<?php
}
}
private static function _render_pricing_rule_principal_amount($name, $pay_type, $pricing_rule) {
if ($pay_type['package_pay_period'] === 0) {
return;
}
$value_per_month = round($pricing_rule['principal_amount'] / $pay_type['package_pay_period'], 2);
?>
<tr>
<td><?php _e( 'Principal amount:', 'wiaas' ); ?></td>
<td class="wiaas_input_container">
<input
id="wiaas_principal_amount_<?php echo $name; ?>"
class="wiaas_principal_amount"
data-name="<?php echo $name; ?>"
data-period="<?php echo $pay_type['package_pay_period']; ?>"
name="wiaas_pricing_rules[<?php echo $name; ?>][principal_amount]"
value="<?php echo $pricing_rule['principal_amount'] ?>"
type="text" />
</td>
<td></td>
</tr>
<tr>
<td></td>
<td>
<?php _e( 'Minimal recurrent package price ( ' .
$pay_type['services_contract_period'] .
' ' . $pay_type['period_unit'] .
'): ', 'wiaas' ); ?>
</td>
<td>
<span id="wiaas_minimal_recurrent_package_price_<?php echo $name; ?>">
<?php echo $value_per_month ?>
</span>
<?php echo ' / ' . $pay_type['period_unit'] ?>
</td>
</tr>
<?php
}
private static function _render_pricing_rule_recurrent_price($name, $pay_type, $pricing_rule) {
$value = $pricing_rule['minimal_services_price'];
if ($pricing_rule['principal_amount'] > 0 && $pay_type['package_pay_period'] > 0) {
$value += $pricing_rule['principal_amount'] / $pay_type['package_pay_period'];
}
?>
<tr>
<td><?php _e( 'Minimal recurrent price:', 'wiaas' ); ?></td>
<td>
<span id="wiaas_minimal_recurrent_price_<?php echo $name; ?>">
<?php echo round($value, 2) ?>
</span>
</td>
</tr>
<?php
}
private static function _render_pricing_controls($pricing_rule_sets) {
$has_available_pay_types = false;
$available_pay_types = Wiaas_Package_Pricing::get_available_pay_types();
foreach ($available_pay_types as $name => $pay_type) {
if (!isset($pricing_rule_sets[$name])) {
$has_available_pay_types = true;
break;
}
}
$class = $has_available_pay_types ? '' : 'wiaas_hidden';
?>
<div id="wiaas_package_price_controls" class="section <?php echo $class ?>">
<select id="wiaas_pay_type" name="wiaas-pay-type" class="pricing_rule_mode">
<?php
foreach ($available_pay_types as $name => $pay_type) {
?>
<option
value="<?php echo $name ?>"
id="wiaas_pay_type_<?php echo $name ?>"
class="<?php echo $class ?>"
>
<?php _e( $pay_type['title'], 'wiaas' ); ?>
</option>
<?php
}
?>
</select>
<button
title="<?php _e( 'Add pricing type.', 'wiaas' ); ?>"
id="wiaas-add-pricing"
type="button"
class="button button-primary">
<?php _e( 'Add Pricing Type', 'wiaas' ); ?>
</button>
</div>
<?php
}
private static function meta_box_javascript() {
?>
<script type="text/javascript">
jQuery(document).ready(function ($) {
$("#wiaas-add-pricing").click(function (event) {
event.preventDefault();
var set_index = $("#wiaas_package_pricing_rules").data('setindex') + 1;
$("#wiaas_package_pricing_rules").data('setindex', set_index);
var pay_type = $('#wiaas_pay_type').val();
var data = {
'pay_type': pay_type,
post:<?php echo isset( $_GET['post'] ) ? $_GET['post'] : 0; ?>,
action: 'create_empty_pricing_rule'
};
$.post(ajaxurl, data, function (response) {
$('#wiaas_package_pricing_rules').append(response);
$(`#wiaas_pay_type_${pay_type}`).addClass('wiaas_hidden');
var available_options = $('#wiaas_pay_type option').not('.wiaas_hidden');
if (available_options.length === 0) {
$('#wiaas_package_price_controls').addClass('wiaas_hidden');
} else {
$('#wiaas_pay_type').val(available_options.first().val());
}
});
});
//Remove Pricing Type
$('#wiaas_package_pricing_rules').delegate('.delete_wiaas_pricing_rule', 'click', function (event) {
event.preventDefault();
if (confirm("<?php _e( 'Are you sure you would like to remove this pay type?', 'wiaas' ); ?>")) {
var name = $(this).data('name');
$('#wiaas-pricing-rule-' + name).slideUp().remove();
// append new option to controls
$(`#wiaas_pay_type_${name}`).removeClass('wiaas_hidden');
var available_options = $('#wiaas_pay_type option').not('.wiaas_hidden');
if (available_options.length === 1) {
$('#wiaas_package_price_controls').removeClass('wiaas_hidden');
$('#wiaas_pay_type').val(available_options.first().val());
}
}
});
$('#wiaas_package_pricing_rules').delegate('.wiaas_minimal_services_price', 'change', function (event) {
event.preventDefault();
var minimal_services_price = parseFloat($(this).val()) || 0;
var principal_amount = 0;
var name = $(this).data('name');
var principal_amount_input = $(`#wiaas_principal_amount_${name}`).first();
if (principal_amount_input) {
principal_amount = parseFloat(principal_amount_input.val() / principal_amount_input.data('period')) || 0;
}
$(`#wiaas_minimal_recurrent_price_${name}`).text((minimal_services_price + principal_amount).toFixed(2));
var services_contract_period = $(this).data('period');
if (services_contract_period > 0) {
var final_services_price = minimal_services_price * services_contract_period;
$(`#wiaas_minimal_services_price_${name}_final`).text(final_services_price.toFixed(2));
}
});
$('#wiaas_package_pricing_rules').delegate('.wiaas_principal_amount', 'change', function (event) {
event.preventDefault();
var principal_amount = parseFloat($(this).val() / $(this).data('period')) || 0;
var minimal_services_price = 0;
var name = $(this).data('name');
var minimal_services_price_input = $(`#wiaas_minimal_services_price_${name}`).first();
if (minimal_services_price_input) {
minimal_services_price = parseFloat(minimal_services_price_input.val()) || 0;
}
$(`#wiaas_minimal_recurrent_price_${name}`).text((minimal_services_price + principal_amount).toFixed(2));
$(`#wiaas_minimal_recurrent_package_price_${name}`).text(principal_amount.toFixed(2));
});
});
</script>
<?php
}
public function process_meta_box( $post_id, $post ) {
Wiaas_Package_Pricing::set_package_prices(
wc_get_product( $post_id ),
$_POST['wiaas_pricing_rules']);
}
}
Wiaas_Admin_Package_Pricing::init();

48
backend/app/plugins/wiaas/includes/admin/package/class-wiaas-admin-package-types.php Normal file
View File

@@ -0,0 +1,48 @@
<?php
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
}
/**
* Class Wiaas_Admin_Package_Types
*/
class Wiaas_Admin_Package_Types {
public static function init() {
add_action( 'woocommerce_product_options_general_product_data', array( __CLASS__, 'package_types_data' ) );
add_action( 'woocommerce_process_product_meta', array( __CLASS__, 'process_meta_box' ));
}
/**
* Renders wiaas package types options
*/
public static function package_types_data() {
global $post;
$package = wc_get_product( $post->ID );
include 'views/html-package-types.php';
}
/**
* Saves posted wiaas package type data
* @param $package_id
*/
public static function process_meta_box($package_id) {
$package = wc_get_product($package_id);
if ($package->get_type() === 'bundle') {
// Save wiaas package type
Wiaas_Package_Type::set_package_type($package_id, $_POST['wiaas_package_type']);
} else {
Wiaas_Package_Type::set_package_type($package_id, null);
}
}
}
Wiaas_Admin_Package_Types::init();

136
backend/app/plugins/wiaas/includes/admin/package/views/html-linked-packages.php Normal file
View File

@@ -0,0 +1,136 @@
<?php
/**
* Wiaas Linked Packages Editor
*/
if ( ! defined( 'ABSPATH' ) ) {
exit;
}
?>
<div id="wiaas_linked_packages" 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( 'Add-ons:', 'wiaas' ); ?></label>
<select
class="wc-product-search"
multiple="multiple"
style="width: 50%;"
id="wiaas_addon_packages"
name="wiaas_addon_packages[]"
data-sortable="true"
data-placeholder="<?php esc_attr_e( 'Search for addons ...', 'wiaas' ); ?>"
data-action="wiaas_json_search_addons"
data-exclude="<?php echo intval( $package->get_id() ); ?>">
<?php
foreach ( $addons as $addon ) {
echo '<option value="' . esc_attr( $addon->get_id() ) . '"' . selected( true, true, false ) . '>' . wp_kses_post( $addon->get_formatted_name() ) . '</option>';
}
?>
</select>
<?php echo wc_help_tip( __( 'This lets you choose which packages will be available as addons.', 'wiaas' ) );?>
</p>
</div>
<div class="options_group">
<script type="text/javascript">
jQuery(document).ready(function ($) {
$("#wiaas_add_option_group").click(function (event) {
event.preventDefault();
var data = {
post:<?php echo isset( $_GET['post'] ) ? $_GET['post'] : 0; ?>,
action: 'wiaas_create_empty_option_group'
};
$.post(ajaxurl, data, function (response) {
$('#wiaas_package_option_groups_list').append(response);
});
});
$('#wiaas_package_option_groups').delegate('.delete_wiaas_option_group', 'click', function (event) {
event.preventDefault();
if (confirm("<?php _e( 'Are you sure you would like to remove this option group?', 'wiaas' ); ?>")) {
var id = $(this).data('id');
$('#wiaas_option_group_' + id).slideUp().remove();
}
});
$('#wiaas_package_option_groups').delegate('.wiaas_option_group_name', 'change', function (event) {
event.preventDefault();
var name = $(this).val();
var id = $(this).data('id');
$(`#wiaas_option_group_${id}_title`).text(name);
});
$('#wiaas_package_option_groups').delegate('.wiaas_option_group_options', 'change', function (event) {
event.preventDefault();
var id = $(this).data('id');
var selected_options_ids = $(this).val() ? $(this).val().toString().split(',') : [];
var previous_options_ids = $(this).data('selected') ? $(this).data('selected').toString().split(',') : [];
var added_option_id = selected_options_ids.find(id => previous_options_ids.indexOf(id) === -1);
var removed_option_id = previous_options_ids.find(id => selected_options_ids.indexOf(id) === -1);
if (added_option_id) {
$(this).children().filter(function() {
var option_id = $(this).val();
return option_id === added_option_id;
}).clone().appendTo(`#wiaas_option_group_${id}_default`);
}
if (removed_option_id) {
$(`#wiaas_option_group_${id}_default`).children().
filter(function() {
var option_id = $(this).val();
return option_id === removed_option_id;
}).
remove();
}
$(this).data('selected', selected_options_ids.join(','));
});
});
</script>
<div id="wiaas_package_option_groups" class="wc-metaboxes-wrapper">
<div class="toolbar toolbar-top">
<button type="button" class="button button-primary" id="wiaas_add_option_group">
<?php esc_html_e( 'Add new option group', 'wiaas' ); ?>
</button>
<span class="expand-close">
<a href="#" class="expand_all"><?php esc_html_e( 'Expand', 'wiaas' ); ?></a>
/
<a href="#" class="close_all"><?php esc_html_e( 'Close', 'wiaas' ); ?></a>
</span>
</div>
<div id="wiaas_package_option_groups_list" class="wc-metaboxes">
<?php
foreach ($option_groups as $group) {
$group_options = isset($group['options']) ? $group['options'] : array();
$id = $group['id'];
include 'html-package-options-group.php';
}
?>
</div>
<div class="toolbar">
<span class="expand-close">
<a href="#" class="expand_all">
<?php esc_html_e( 'Expand', 'wiaas' ); ?>
</a>
/
<a href="#" class="close_all"><?php esc_html_e( 'Close', 'wiaas' ); ?></a>
</span>
</div>
</div>
</div>
</div>

86
backend/app/plugins/wiaas/includes/admin/package/views/html-package-options-group.php Normal file
View File

@@ -0,0 +1,86 @@
<?php
/**
* Wiaas Package Option Group Editor
*/
if ( ! defined( 'ABSPATH' ) ) {
exit;
}
?>
<div id="wiaas_option_group_<?php echo esc_attr( $id ); ?>" class="wiaas_option_group wc-metabox closed">
<h3>
<a
href="#"
data-id="<?php echo esc_attr( $id ); ?>"
class="delete delete_wiaas_option_group">
<?php esc_html_e( 'Remove', 'wiaas' ); ?>
</a>
<div class="handlediv" title="<?php esc_attr_e( 'Click to toggle', 'wiaas' ); ?>"></div>
<strong id="wiaas_option_group_<?php echo esc_attr( $id ); ?>_title">
<?php echo $group['name']; ?>
</strong>
</h3>
<div class="wc-metabox-content">
<table cellpadding="0" cellspacing="0">
<tbody>
<tr>
<td>
<label><?php esc_html_e( 'Name', 'wiaas' ); ?>:</label>
<input
type="text"
data-id="<?php echo esc_attr( $id ); ?>"
class="wiaas_option_group_name"
name="wiaas_option_groups[<?php echo esc_attr( $id ); ?>][name]"
value="<?php echo esc_attr( $group['name'] ); ?>" />
<input
type="hidden"
name="wiaas_option_groups[<?php echo esc_attr( $id ); ?>][id]"
value="<?php echo esc_attr( $id ); ?>" />
</td>
<td rowspan="3">
<label><?php esc_html_e( 'Options:', 'wiaas' ); ?></label>
<select
class="wc-product-search wiaas_option_group_options"
multiple="multiple"
style="width: 50%;"
name="wiaas_option_groups[<?php echo esc_attr( $id ); ?>][options][]"
data-id="<?php echo esc_attr( $id ); ?>"
data-sortable="true"
data-placeholder="<?php esc_attr_e( 'Search for options ...', 'wiaas' ); ?>"
data-action="wiaas_json_search_options"
data-selected="<?php echo implode( ',', array_map(function($option) { return $option->get_id(); }, $group_options)) ?>"
data-exclude="">
<?php
foreach ( $group_options as $option ) {
echo '<option value="' . esc_attr( $option->get_id() ) . '"' . selected( true, true, false ) . '>' . wp_kses_post( $option->get_formatted_name() ) . '</option>';
}
?>
</select>
</td>
</tr>
<tr>
<td>
<label>
<?php esc_html_e( 'Default option:', 'wiaas' ); ?>
</label>
<select
id="wiaas_option_group_<?php echo esc_attr( $id ); ?>_default"
name="wiaas_option_groups[<?php echo esc_attr( $id ); ?>][default]"
>
<?php
foreach ( $group_options as $option ) {
echo '<option value="' . esc_attr( $option->get_id() ) . '"' .
selected( $option->get_id(), $group['default'], false ) .
'>' .
wp_kses_post( $option->get_formatted_name() ) .
'</option>';
}
?>
</select>
</td>
</tr>
</tbody>
</table>
</div>
</div>

84
backend/app/plugins/wiaas/includes/admin/package/views/html-package-types.php Normal file
View File

@@ -0,0 +1,84 @@
<?php
/**
* Wiaas Package Types Editor
*/
if ( ! defined( 'ABSPATH' ) ) {
exit;
}
?>
<div id="wiaas_package_type_editor" class="options_group show_if_bundle hidden">
<script type="text/javascript">
jQuery(document).ready(function ($) {
$("#wiaas_package_type").change(function (event) {
event.preventDefault();
handlePackageTypeToolsVisiblity();
});
function handlePackageTypeToolsVisiblity() {
var currentPackageType = $('#wiaas_package_type').val();
var productType = $('#product-type').val();
if (currentPackageType === 'standard' && productType === 'bundle') {
$('#woocommerce-product-data').find('.linked_product_tab').show();
} else {
$('#woocommerce-product-data').find('.linked_product_tab').hide();
}
}
function showDownloadableFiles() {
$('#general_product_data').find('.show_if_downloadable').each(function() {
$(this).show();
$(this).removeClass('hidden');
$(this).removeClass('show_if_downloadable');
$(this).find('._download_limit_field, ._download_expiry_field').hide();
});
}
showDownloadableFiles();
handlePackageTypeToolsVisiblity();
});
</script>
<p class="form-field">
<label for="wiaas_package_type"><?php esc_html_e( 'Package type:', 'wiaas' ); ?></label>
<select id="wiaas_package_type" name="wiaas_package_type">
<?php
// Array of available package types
$package_types = Wiaas_Package_Type::get_available_package_types();
$current_package_type = Wiaas_Package_Type::get_package_type($package->get_id());
$current_package_type = isset($current_package_type) ? $current_package_type : 'standard';
if ( ! empty( $package_types ) ) {
foreach ( $package_types as $package_type ) {
$label = '';
switch($package_type) {
case 'standard':
$label = 'Standard';
break;
case 'option':
$label = 'Option';
break;
case 'add_on':
$label = 'Add-on';
break;
}
echo '<option ' .
'value="' . esc_attr( $package_type ) . '" ' .
selected( $package_type, $current_package_type, false ) .
' >' .
esc_html( $label ) .
'</option>';
}
}
?>
</select>
<?php echo wc_help_tip( __( 'Choose Wiaas package type.', 'wiaas' ) );?>
</p>
</div>

78
backend/app/plugins/wiaas/includes/admin/pricing/class-wiaas-admin-package-pricing.php Normal file
View File

@@ -0,0 +1,78 @@
<?php
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
}
/**
* Class Wiaas_Package_Pricing
*/
class Wiaas_Admin_Package_Pricing {
public static function init() {
add_action( 'woocommerce_product_data_tabs', array( __CLASS__, 'package_data_tabs' ) );
add_action( 'woocommerce_product_data_panels', array( __CLASS__, 'package_data_panel' ) );
add_action( 'wp_ajax_create_empty_pricing_rule', array(__CLASS__, 'create_empty_pricing_rule') );
add_action( 'woocommerce_process_product_meta', array( __CLASS__, 'process_meta_box' ), 1, 2 );
}
/**
* Creates and renders new empty package pricing rule
*/
public static function create_empty_pricing_rule() {
$pay_type = $_POST['pay_type'];
$pricing_rules = array();
$pricing_rules[ $pay_type ] = Wiaas_Package_Pricing::get_empty_pricing_rule();
require 'views/html-package-pricing-rules-list.php';
die();
}
/**
* Registers wiaas pricing tab for package data
* @param $tabs
*
* @return array
*/
public static function package_data_tabs($tabs) {
$tabs[ 'bundled_packages_price' ] = array(
'label' => __( 'Pricing', 'wiaas' ),
'target' => 'wiaas_package_price',
'class' => array( 'show_if_bundle', 'bundled_package_tab' ),
'priority' => 50
);
return $tabs;
}
/**
* Renderes wiaas pricing tab content for package
*/
public static function package_data_panel() {
global $post;
$package = wc_get_product( $post->ID );
$pricing_rules = Wiaas_Package_Pricing::get_package_prices($package);
$commission = Wiaas_Package_Pricing::get_package_pricing_commission($package);
include 'views/html-package-pricing.php';
}
/**
* Saves posted package pricing rules
* @param $post_id
* @param $post
*/
public function process_meta_box( $post_id, $post ) {
Wiaas_Package_Pricing::set_package_prices(
wc_get_product( $post_id ),
$_POST['wiaas_pricing_rules'],
$_POST['wiaas_pricing_rules_commision']);
}
}
Wiaas_Admin_Package_Pricing::init();

50
backend/app/plugins/wiaas/includes/admin/pricing/class-wiaas-admin-product-pricing.php Normal file
View File

@@ -0,0 +1,50 @@
<?php
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
}
/**
* Class Wiaas_Admin_Product_Pricing
*/
class Wiaas_Admin_Product_Pricing {
public static function init() {
add_action( 'woocommerce_product_options_pricing', array( __CLASS__, 'product_pricing' ) );
add_action( 'woocommerce_process_product_meta', array( __CLASS__, 'process_meta_box' ), 1, 2 );
}
/**
* Renders wiaas pricing options for product
*/
public static function product_pricing() {
global $post;
$product = wc_get_product( $post->ID );
$product_pricing = Wiaas_Product_Pricing::get_product_price($product);
include 'views/html-product-pricing.php';
}
/**
* Saves posted product pricing settings
* @param $post_id
* @param $post
*/
public function process_meta_box( $post_id, $post ) {
$product = wc_get_product( $post_id );
if ($product->get_type() === 'simple') {
$is_recurring = $_POST['_wiaas_recurring_price'] === 'yes';
$pay_period = isset($_POST['_wiaas_recurring_pay_period']) ? $_POST['_wiaas_recurring_pay_period'] : 0;
Wiaas_Product_Pricing::set_product_price($product, $product->get_price(), $is_recurring, $pay_period);
}
}
}
Wiaas_Admin_Product_Pricing::init();

50
backend/app/plugins/wiaas/includes/admin/pricing/views/html-package-pricing-rule-principal-amount.php Normal file
View File

@@ -0,0 +1,50 @@
<?php
if ( ! defined( 'ABSPATH' ) ) {
exit;
}
?>
<?php
if ($pay_type['package_pay_period'] === 0) {
return;
}
$value_per_month = round( wiaas_PMT(
Wiaas_Pricing::INTEREST_RATE,
$pay_type['package_pay_period'],
$pricing_rule['principal_amount']), 0);
?>
<tr>
<td><?php _e( 'Principal amount:', 'wiaas' ); ?></td>
<td class="wiaas_input_container">
<input
id="wiaas_principal_amount_<?php echo $name; ?>"
class="wiaas_principal_amount"
data-name="<?php echo $name; ?>"
data-period="<?php echo $pay_type['package_pay_period']; ?>"
name="wiaas_pricing_rules[<?php echo $name; ?>][principal_amount]"
value="<?php echo $pricing_rule['principal_amount'] ?>"
type="text" />
</td>
<td></td>
</tr>
<tr>
<td></td>
<td>
<?php _e( 'Minimal recurrent package price ( ' .
$pay_type['services_contract_period'] .
' ' . $pay_type['period_unit'] .
'): ', 'wiaas' ); ?>
</td>
<td>
<span id="wiaas_minimal_recurrent_package_price_<?php echo $name; ?>">
<?php echo $value_per_month ?>
</span>
<?php echo ' / ' . $pay_type['period_unit'] ?>
</td>
</tr>
<?php
?>

28
backend/app/plugins/wiaas/includes/admin/pricing/views/html-package-pricing-rule-recurrent-price.php Normal file
View File

@@ -0,0 +1,28 @@
<?php
if ( ! defined( 'ABSPATH' ) ) {
exit;
}
?>
<?php
$value = $pricing_rule['minimal_services_price'];
if ($pricing_rule['principal_amount'] > 0 && $pay_type['package_pay_period'] > 0) {
$value += wiaas_PMT(
Wiaas_Pricing::INTEREST_RATE,
$pay_type['package_pay_period'],
$pricing_rule['principal_amount']);
}
?>
<tr>
<td><?php _e( 'Minimal recurrent price:', 'wiaas' ); ?></td>
<td>
<span id="wiaas_minimal_recurrent_price_<?php echo $name; ?>">
<?php echo round($value, 0) ?>
</span>
</td>
</tr>
<?php
?>

57
backend/app/plugins/wiaas/includes/admin/pricing/views/html-package-pricing-rule-services-price.php Normal file
View File

@@ -0,0 +1,57 @@
<?php
if ( ! defined( 'ABSPATH' ) ) {
exit;
}
?>
<?php
$label = 'Minimal services and support price ';
if ($pay_type['services_contract_period'] > 0) {
$label .= '(' . $pay_type['services_contract_period'] . ' ' . $pay_type['period_unit'] . ')';
} else {
$label .= '(Unbound)';
}
?>
<tr>
<td class="wiaas_label_container">
<?php _e( $label . ':', 'wiaas' ); ?>
</td>
<td class="wiaas_input_container">
<input
id="wiaas_minimal_services_price_<?php echo $name; ?>"
class="wiaas_minimal_services_price"
data-name="<?php echo $name; ?>"
data-period="<?php echo $pay_type['services_contract_period']; ?>"
name="wiaas_pricing_rules[<?php echo $name; ?>][minimal_services_price]"
value="<?php echo $pricing_rule['minimal_services_price'] ?>"
type="text" />
</td>
<td>
<span style="line-height: 28px; margin-left: 10px;">
<?php echo ' / ' . $pay_type['period_unit'] ?>
</span>
</td>
</tr>
<?php
if ($pay_type['services_contract_period'] > 0) {
?>
<tr>
<td></td>
<td>Final total:</td>
<td>
<span id="wiaas_minimal_services_price_<?php echo $name; ?>_final">
<?php echo round(
$pricing_rule['minimal_services_price'] * $pay_type['services_contract_period'],
2) ?>
</span>
</td>
</tr>
<?php
}
?>

59
backend/app/plugins/wiaas/includes/admin/pricing/views/html-package-pricing-rules-list.php Normal file
View File

@@ -0,0 +1,59 @@
<?php
if ( ! defined( 'ABSPATH' ) ) {
exit;
}
$available_pay_types = Wiaas_Package_Pricing::get_available_pay_types();
foreach ( $pricing_rules as $name => $pricing_rule ) {
$pay_type = $available_pay_types[$name];
?>
<div id="wiaas-pricing-rule-<?php echo $name; ?>" class="wiaas-pricing-rule">
<div class="section">
<h4 class="first"><?php echo $pay_type['title']; ?>
<a href="#" data-name="<?php echo $name; ?>"
class="delete_wiaas_pricing_rule">
REMOVE
</a>
</h4>
</div>
<div class="clear"></div>
<table>
<tbody>
<tr>
<td class="wiaas_label_container">
<?php _e( 'Minimal fixed price:', 'wiaas' ); ?>
</td>
<td>
<input
id="wiaas_minimal_fixed_price_<?php echo $name; ?>"
data-name="<?php echo $name; ?>"
name="wiaas_pricing_rules[<?php echo $name; ?>][minimal_fixed_price]"
value="<?php echo $pricing_rule['minimal_fixed_price'] ?>"
type="text" />
</td>
<td></td>
</tr>
<?php require 'html-package-pricing-rule-recurrent-price.php'; ?>
<?php require 'html-package-pricing-rule-principal-amount.php'; ?>
<?php require 'html-package-pricing-rule-services-price.php'; ?>
<tr>
<td class="wiaas_label_container">
<?php _e( 'Max contract period:', 'wiaas' ); ?>
</td>
<td>
<span id="wiaas_max_contract_period_<?php echo $name; ?>">
<?php echo $pay_type['max_contract_period'] . ' ' . $pay_type['period_unit'] ?>
</span>
</td>
<td></td>
</tr>
</tbody>
</table>
</div>
<?php
}
?>

209
backend/app/plugins/wiaas/includes/admin/pricing/views/html-package-pricing.php Normal file
View File

@@ -0,0 +1,209 @@
<?php
if ( ! defined( 'ABSPATH' ) ) {
exit;
}
?>
<div id="wiaas_package_price" class="panel woocommerce_options_panel">
<script type="text/javascript">
jQuery(document).ready(function ($) {
$("#wiaas-add-pricing").click(function (event) {
event.preventDefault();
var set_index = $("#wiaas_package_pricing_rules").data('setindex') + 1;
$("#wiaas_package_pricing_rules").data('setindex', set_index);
var pay_type = $('#wiaas_pay_type').val();
var data = {
'pay_type': pay_type,
post:<?php echo isset( $_GET['post'] ) ? $_GET['post'] : 0; ?>,
action: 'create_empty_pricing_rule'
};
$.post(ajaxurl, data, function (response) {
$('#wiaas_package_pricing_rules').append(response);
$(`#wiaas_pay_type_${pay_type}`).addClass('wiaas_hidden');
var available_options = $('#wiaas_pay_type option').not('.wiaas_hidden');
if (available_options.length === 0) {
$('#wiaas_package_price_controls').addClass('wiaas_hidden');
} else {
$('#wiaas_pay_type').val(available_options.first().val());
}
});
});
//Remove Pricing Type
$('#wiaas_package_pricing_rules').delegate('.delete_wiaas_pricing_rule', 'click', function (event) {
event.preventDefault();
if (confirm("<?php _e( 'Are you sure you would like to remove this pay type?', 'wiaas' ); ?>")) {
var name = $(this).data('name');
$('#wiaas-pricing-rule-' + name).slideUp().remove();
// append new option to controls
$(`#wiaas_pay_type_${name}`).removeClass('wiaas_hidden');
var available_options = $('#wiaas_pay_type option').not('.wiaas_hidden');
if (available_options.length === 1) {
$('#wiaas_package_price_controls').removeClass('wiaas_hidden');
$('#wiaas_pay_type').val(available_options.first().val());
}
}
});
$('#wiaas_package_pricing_rules').delegate('.wiaas_minimal_services_price', 'change', function (event) {
event.preventDefault();
var minimal_services_price = parseFloat($(this).val()) || 0;
var principal_amount = 0;
var name = $(this).data('name');
var principal_amount_input = $(`#wiaas_principal_amount_${name}`).first();
if (principal_amount_input) {
principal_amount = parseFloat(principal_amount_input.val() / principal_amount_input.data('period')) || 0;
}
$(`#wiaas_minimal_recurrent_price_${name}`).text((minimal_services_price + principal_amount).toFixed(2));
var services_contract_period = $(this).data('period');
if (services_contract_period > 0) {
var final_services_price = minimal_services_price * services_contract_period;
$(`#wiaas_minimal_services_price_${name}_final`).text(final_services_price.toFixed(2));
}
});
$('#wiaas_package_pricing_rules').delegate('.wiaas_principal_amount', 'change', function (event) {
event.preventDefault();
var value = parseFloat($(this).val());
var period = parseFloat($(this).data('period'));
var interestRate = 0.58;
var principal_amount = calculateFinancing(interestRate, period, value);
var minimal_services_price = 0;
var name = $(this).data('name');
var minimal_services_price_input = $(`#wiaas_minimal_services_price_${name}`).first();
if (minimal_services_price_input) {
minimal_services_price = parseFloat(minimal_services_price_input.val()) || 0;
}
$(`#wiaas_minimal_recurrent_price_${name}`).text((minimal_services_price + principal_amount).toFixed(0));
$(`#wiaas_minimal_recurrent_package_price_${name}`).text(principal_amount.toFixed(0));
});
/**
* Copy of Excel's PMT function.
* Credit: http://stackoverflow.com/questions/2094967/excel-pmt-function-in-js
*
* @param ratePerPeriod The interest rate for the loan.
* @param numberOfPayments The total number of payments for the loan in months.
* @param presentValue The present value, or the total amount that a series of future payments is worth now;
* Also known as the principal.
* @param futureValue The future value, or a cash balance you want to attain after the last payment is made.
* If fv is omitted, it is assumed to be 0 (zero), that is, the future value of a loan is 0.
* @param type Optional, defaults to 0. The number 0 (zero) or 1 and indicates when payments are due.
* 0 = At the end of period
* 1 = At the beginning of the period
* @returns {number}
*/
function calculateFinancing(ratePerPeriod, numberOfPayments, presentValue, futureValue = 0, type = 0) {
/*var q = 0;
var c = 0;
const monthlyRatePerPeriod = ratePerPeriod / 12;
if (monthlyRatePerPeriod !== 0.0) {
// Interest rate exists
q = Math.pow(1 + monthlyRatePerPeriod, numberOfPayments);
c = (monthlyRatePerPeriod * (futureValue + (q * presentValue))) / ((-1 + q) * (1 + monthlyRatePerPeriod * (type)));
return c.toFixed(2);
} else if (numberOfPayments !== 0.0) {
// No interest rate, but number of payments exists
return -(futureValue + presentValue) / numberOfPayments;
}
return 0;*/
const rates = {
24 : 4.282,
30 : 3.451,
36 : 2.896,
42 : 2.500,
48 : 2.223,
54 : 2.025,
60 : 1.834
};
const interest = rates[numberOfPayments] || 10;
return presentValue * (interest / 100);
}
});
</script>
<div class="options_group">
<?php
woocommerce_wp_text_input(
array(
'id' => '_wiaas_price_commision',
'name' => 'wiaas_pricing_rules_commision',
'value' => $commission,
'label' => __( 'Commision (Percent):', 'wiaas' ),
'type' => 'number',
)
);
?>
</div>
<div class="options_group">
<div class="wc-metaboxes-wrapper">
<?php
$has_available_pay_types = false;
$available_pay_types = Wiaas_Package_Pricing::get_available_pay_types();
foreach ($available_pay_types as $name => $pay_type) {
if (!isset($pricing_rule_sets[$name])) {
$has_available_pay_types = true;
break;
}
}
$class = $has_available_pay_types ? '' : 'wiaas_hidden';
?>
<div id="wiaas_package_price_controls" class="toolbar toolbar-top <?php echo $class ?>">
<select id="wiaas_pay_type" name="wiaas-pay-type" class="pricing_rule_mode">
<?php
foreach ($available_pay_types as $name => $pay_type) {
?>
<option
value="<?php echo $name ?>"
id="wiaas_pay_type_<?php echo $name ?>"
class="<?php echo $class ?>"
>
<?php _e( $pay_type['title'], 'wiaas' ); ?>
</option>
<?php
}
?>
</select>
<button
title="<?php _e( 'Add pricing type.', 'wiaas' ); ?>"
id="wiaas-add-pricing"
type="button"
class="button button-primary">
<?php _e( 'Add Pricing Type', 'wiaas' ); ?>
</button>
</div>
<div id="wiaas_package_pricing_rules" class="wc-metaboxes">
<?php
require 'html-package-pricing-rules-list.php';
?>
</div>
</div>
</div>
</div>

36
backend/app/plugins/wiaas/includes/admin/pricing/views/html-product-pricing.php Normal file
View File

@@ -0,0 +1,36 @@
<?php
if ( ! defined( 'ABSPATH' ) ) {
exit;
}
?>
<script>
jQuery(document).ready(function($) {
$("#general_product_data").find('.pricing').addClass('hide_if_bundle');
$("#general_product_data").find('.pricing').removeClass('show_if_bundle');
if ($('#product-type').val() === 'bundle') {
$("#general_product_data .pricing").hide();
}
});
</script>
<?php
woocommerce_wp_checkbox(
array(
'id' => '_wiaas_recurring_price',
'value' => $product_pricing['is_recurring'] ? 'yes' : 'no',
'data_type' => 'price',
'label' => __( $product->get_category_ids()[0], 'wiaas' ),
)
);
woocommerce_wp_text_input(
array(
'id' => '_wiaas_recurring_pay_period',
'value' => $product_pricing['pay_period'],
'label' => __( 'Pay period (Months)', 'wiaas' ),
'type' => 'number',
)
);
?>

98
backend/app/plugins/wiaas/includes/api/class-wiaas-cart-api.php
View File

@@ -72,11 +72,10 @@ class Wiaas_Cart_API {
$count = 0; $count = 0;
foreach ($items as $key => $item) { foreach ($items as $key => $item) {
if (isset($item['bundled_by'])) { if (isset($item['_wiaas_standard_package'])) {
continue;
}
$count++; $count++;
} }
}
return new WP_REST_Response(array( return new WP_REST_Response(array(
'count' => $count, 'count' => $count,
@@ -94,39 +93,78 @@ class Wiaas_Cart_API {
$result = array(); $result = array();
foreach ($items as $key => $item) { foreach ($items as $key => $item) {
if (isset($item['bundled_by'])) { if (!isset($item['_wiaas_standard_package'])) {
continue; continue;
} }
$package = wc_get_product($item['product_id']); $package = wc_get_product($item['product_id']);
// Retrieve package addons
$addon_cart_items = wiaas_get_cart_item_addons($item);
$additional_packages = array();
foreach ($addon_cart_items as $addon_cart_item) {
$additional_package = wc_get_product($addon_cart_item['product_id']);
$additional_packages[] = array(
'idAdditionalPackage' => $additional_package->get_id(),
'packageName' => $additional_package->get_title(),
'prices' => array(
'fixedExtra' => $addon_cart_item['_wiaas_payment']['fixed_extra'],
'recurrentExtra' => $addon_cart_item['_wiaas_payment']['recurrent_extra'],
'servicesExtra' => $addon_cart_item['_wiaas_payment']['services_extra'],
)
);
}
// Retrieve package options
$option_cart_items = wiaas_get_cart_item_options($item);
$package_options = array();
foreach ($option_cart_items as $option_cart_item) {
$option_package = wc_get_product($option_cart_item['product_id']);
$package_options[] = array(
'idOptionPackage' => $option_package->get_id(),
'groupName' => $option_cart_item['_wiaas_option_group_name'],
'packageName' => $option_package->get_title(),
'prices' => array(
'fixedExtra' => $option_cart_item['_wiaas_payment']['fixed_extra'],
'recurrentExtra' => $option_cart_item['_wiaas_payment']['recurrent_extra'],
'servicesExtra' => $option_cart_item['_wiaas_payment']['services_extra'],
)
);
}
$totalPrices = Wiaas_Cart::get_cart_item_total($item);
$country = Wiaas_Countries::get_package_country($package);
$result[] = array( $result[] = array(
'idPackage' => $item['product_id'], 'idPackage' => $item['product_id'],
'key' => $item['key'], 'key' => $item['key'],
'packageName' => $package->get_title(), 'packageName' => $package->get_title(),
'additionalPackages' => array(), 'additionalPackages' => $additional_packages,
'areAdditionalAvailable' => true, 'areAdditionalAvailable' => true,
'areOptionsAvailable' => true, 'areOptionsAvailable' => true,
'bids' => array(), 'bids' => array(),
'commercialLead' => 'Coor Service Management', 'commercialLead' => 'Coor Service Management',
'country' => array( 'country' => array(
'currency' => 'SEK' 'currency' => $country['currency']
), ),
'options' => array(), 'options' => $package_options,
'quantity' => $item['quantity'], 'quantity' => $item['quantity'],
'idPayType' => $item['_wiaas_price']['id'], 'idPayType' => $item['_wiaas_payment']['id'],
'payType' => $item['_wiaas_price']['payment_type'], 'payType' => $item['_wiaas_payment']['payment_type'],
'periodUnit' => $item['_wiaas_price']['period_unit'], 'periodUnit' => $item['_wiaas_payment']['period_unit'],
'idPrice' => $item['_wiaas_price']['id'], 'idPrice' => $item['_wiaas_payment']['id'],
'fixedPrice' => $item['_wiaas_price']['minimal_fixed_price'], 'fixedPrice' => $item['_wiaas_payment']['fixed_extra'],
'recurentPrice' => $item['_wiaas_price']['recurrent_price'], 'recurrentPrice' => $item['_wiaas_payment']['recurrent_extra'],
'servicesPrice' => $item['_wiaas_price']['minimal_services_price'], 'servicesPrice' => $item['_wiaas_payment']['services_extra'],
'totalPrices' => array( 'totalPrices' => array(
'fixedPrice' => $item['_wiaas_price']['minimal_fixed_price'], 'fixedPrice' => $totalPrices['fixed_extra'],
'recurentPrice' => $item['_wiaas_price']['recurrent_price'], 'recurrentPrice' => $totalPrices['recurrent_extra'],
'servicesPrice' => $item['_wiaas_price']['minimal_services_price'], 'servicesPrice' => $totalPrices['services_extra'],
), ),
'status' => 'available', 'status' => 'available',
@@ -136,6 +174,7 @@ class Wiaas_Cart_API {
return new WP_REST_Response( return new WP_REST_Response(
array( array(
'cartItems' => $result, 'cartItems' => $result,
'items' => $items,
'totalPrice' => '' 'totalPrice' => ''
) )
); );
@@ -162,21 +201,9 @@ class Wiaas_Cart_API {
*/ */
public static function add_package_to_cart() { public static function add_package_to_cart() {
$package_id = $_POST['package_id']; $package_id = $_POST['package_id'];
$price_id = $_POST['price_id'];
$package = wc_get_product($package_id); $success = WC()->cart->add_to_cart($package_id, 1, 0, array(), array(
$prices = Wiaas_Package_Pricing::get_package_prices($package); '_wiaas_standard_package' => true
$selected_price = $prices[$price_id];
WC()->session->set('wiaas_price_' . $package_id, $price_id);
$success = WC()->cart->add_to_cart(
$package_id,
1,
0,
array(),
array(
'_wiaas_price' => $selected_price,
)); ));
if ($success) { if ($success) {
@@ -279,6 +306,15 @@ class Wiaas_Cart_API {
$order_id = WC()->checkout()->create_order(array()); $order_id = WC()->checkout()->create_order(array());
$order = wc_get_order( $order_id ); $order = wc_get_order( $order_id );
// set order currency
$line_items = $order->get_items();
foreach ($line_items as $line_item) {
if (isset($line_item['wiaas_currency'])) {
$order->set_currency($line_item['wiaas_currency']);
break;
}
}
$order->set_shipping_city($delivery_address['city']); $order->set_shipping_city($delivery_address['city']);
$order->set_shipping_country($delivery_address['countryName']); $order->set_shipping_country($delivery_address['countryName']);
$order->set_shipping_address_1($delivery_address['detailedAddress']); $order->set_shipping_address_1($delivery_address['detailedAddress']);

42
backend/app/plugins/wiaas/includes/api/class-wiaas-document-api.php Normal file
View File

@@ -0,0 +1,42 @@
<?php
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
}
/**
* 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 {
/**
* Endpoint namespace.
*
* @var string
*/
private static $namespace = 'wiaas';
public static function register_routes() {
register_rest_route( self::$namespace, 'download-package-file', array(
'methods' => 'GET',
'permission_callback' => 'is_user_logged_in',
'callback' => array(__CLASS__, 'download_package_file'),
) );
}
/**
* Download package document
*/
public static function download_package_file() {
$document_id = $_GET['document_id'];
$package_id = $_GET['package_id'];
$package = wc_get_product($package_id);
$file = $package->get_file($document_id);
if ($file) {
WC_Download_Handler::download_file_force($package->get_file_download_path($document_id), $file->get_name());
}
}
}

3
backend/app/plugins/wiaas/includes/class-wiaas-admin.php
View File

@@ -7,7 +7,8 @@ if ( ! defined( 'ABSPATH' ) ) {
class Wiaas_Admin { class Wiaas_Admin {
public static function init() { public static function init() {
require_once dirname( __FILE__ ) . '/admin/package/class-wiaas-admin-package-pricing.php'; require_once dirname( __FILE__ ) . '/admin/class-wiaas-admin-package.php';
require_once dirname( __FILE__ ) . '/admin/class-wiaas-admin-pricing.php';
} }
} }

4
backend/app/plugins/wiaas/includes/class-wiaas-api.php
View File

@@ -33,12 +33,14 @@ class Wiaas_API {
#Delivery process controller #Delivery process controller
include_once dirname( __FILE__ ) . '/api/class-wiaas-rest-delivery-process-api.php'; include_once dirname( __FILE__ ) . '/api/class-wiaas-rest-delivery-process-api.php';
include_once dirname( __FILE__ ) . '/api/class-wiaas-cart-api.php'; include_once dirname( __FILE__ ) . '/api/class-wiaas-cart-api.php';
include_once dirname( __FILE__ ) . '/api/class-wiaas-document-api.php';
} }
public static function register_rest_routes() { public static function register_rest_routes() {
$controllers = array( $controllers = array(
'Wiass_REST_Delivery_Process_API', 'Wiass_REST_Delivery_Process_API',
'Wiaas_Cart_API' 'Wiaas_Cart_API',
'Wiaas_Document_API'
); );
foreach ( $controllers as $controller ) { foreach ( $controllers as $controller ) {

336
backend/app/plugins/wiaas/includes/class-wiaas-cart.php Normal file
View File

@@ -0,0 +1,336 @@
<?php
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
}
/**
* TODO: This implementation is temporary and will probably be changed during implementation of currently pending cart task
*
* Class Wiaas_Cart
*/
class Wiaas_Cart {
public static function init() {
add_action( 'woocommerce_checkout_create_order_line_item', array( __CLASS__, 'add_order_item_meta' ), 10, 3 );
add_filter( 'woocommerce_hidden_order_itemmeta', array( __CLASS__, 'hidden_order_item_meta' ) );
add_filter( 'woocommerce_add_cart_item_data', array( __CLASS__, 'add_cart_item_data' ), 10, 2 );
add_action( 'woocommerce_before_calculate_totals', array( __CLASS__, 'on_calculate_totals' ), 99, 1);
add_action( 'woocommerce_cart_loaded_from_session', array( __CLASS__, 'on_calculate_totals' ), 99, 1);
// Add options and addons to cart.
add_action( 'woocommerce_add_to_cart', array( __CLASS__, 'add_additional_packages_to_cart' ), 10, 6 );
}
/**
* Extend cart item data with wiaas package payment info and addons and options
*
* Every package cart item will be extended with its payment info but only standard package type
* will be extended with addons and options arrays
*
* @param $cart_item_data
* @param $package_id
*
* @return array
*/
public static function add_cart_item_data($cart_item_data, $package_id) {
$is_valid = isset( $_POST[ 'price_id' ]) &&
WC_Product_Factory::get_product_type( $package_id ) === 'bundle';
if (!$is_valid) {
return $cart_item_data;
}
$package_type = Wiaas_Package_Type::get_package_type($package_id);
$package = wc_get_product( $package_id );
switch ($package_type) {
case 'standard':
$cart_item['_wiaas_standard_package'] = true;
// Prepare addons additional data for later use.
if ( ! isset( $cart_item_data['_wiaas_addon_items'] ) ) {
$cart_item_data['_wiaas_addon_items' ] = array();
}
// Prepare options additional data for later use.
if ( ! isset( $cart_item_data['_wiaas_option_items'] ) ) {
$cart_item_data['_wiaas_option_items' ] = array();
}
$country = Wiaas_Countries::get_package_country($package);
if (isset($country)) {
$cart_item_data['_wiaas_currency'] = $country['currency'];
}
$package_prices = Wiaas_Pricing::get_standard_package_customer_prices($package);
break;
case 'add_on':
$parent_key = $cart_item_data['_wiaas_addon_for'];
$parent_item = WC()->cart->get_cart_item($parent_key);
$package_prices = Wiaas_Pricing::get_addon_package_customer_price($package, $parent_item['data']);
break;
case 'option':
$parent_key = $cart_item_data['_wiaas_option_for'];
$parent_item = WC()->cart->get_cart_item($parent_key);
$option_group_name = Wiaas_Package_Option_Groups::get_group_name_for_package_option($parent_item['data'], $package);
$cart_item_data['_wiaas_option_group_name' ] = $option_group_name;
$package_prices = Wiaas_Pricing::get_option_package_customer_price($package, $parent_item['data']);
break;
}
$selected_price_index = array_search($_POST['price_id'], array_column($package_prices, 'id'));
if (is_numeric($selected_price_index) && isset($package_prices[$selected_price_index])) {
$cart_item_data['_wiaas_payment'] = $package_prices[$selected_price_index];
}
return $cart_item_data;
}
/**
* Add selected package options and addons after parent standard package is added to cart
*
* @param $cart_item_key
* @param $package_id
* @param $quantity
* @param $variation_id
* @param $variation
* @param $cart_item_data
*/
public static function add_additional_packages_to_cart($cart_item_key, $package_id, $quantity, $variation_id, $variation, $cart_item_data) {
remove_action( 'woocommerce_add_to_cart', array( __CLASS__, 'add_additional_packages_to_cart' ));
self::_add_options_to_cart($cart_item_key, $package_id, $cart_item_data);
self::_add_addons_to_cart($cart_item_key, $package_id, $cart_item_data);
add_action( 'woocommerce_add_to_cart', array( __CLASS__, 'add_additional_packages_to_cart' ), 10, 6 );
}
/**
* Update package cart item with `minimal_fixed_price` as its price
* so resulting totals would be sum of these prices
* @param $cart
*/
public static function on_calculate_totals($cart) {
foreach ($cart->cart_contents as $key => $cart_item) {
if (isset($cart_item['_wiaas_standard_package'])) {
$total = self::get_cart_item_total($cart_item);
WC()->cart->cart_contents[ $key ]['data']->set_price( $total['fixed_extra'] );
} else {
WC()->cart->cart_contents[ $key ]['data']->set_price( 0 );
}
}
}
/**
* Persist used payment type information for package in corresponding order line item.
* Also for standard package type list of addons and options will be saved.
*
* @param $order_item
* @param $cart_item_key
* @param $cart_item
* @param $order
*
* @return array
*/
public static function add_order_item_meta( $order_item, $cart_item_key, $cart_item ) {
if (wc_pb_is_bundle_container_cart_item($cart_item) && isset($cart_item['_wiaas_payment'])) {
$payment = $cart_item['_wiaas_payment'];
$total = self::get_cart_item_total($cart_item);
$order_item->add_meta_data( '_wiaas_payment_type', $payment['payment_type'], true );
$order_item->add_meta_data( '_wiaas_services_extra', $total['services_extra'], true );
$order_item->add_meta_data( '_wiaas_service_contract_period', $payment['services_contract_period'], true );
$order_item->add_meta_data( '_wiaas_max_contract_period', $payment['max_contract_period'], true );
$order_item->add_meta_data( '_wiaas_period_unit', $payment['period_unit'], true );
$order_item->add_meta_data( '_wiaas_recurrent_extra', $total['recurrent_extra'], true );
$order_item->add_meta_data( '_wiaas_pay_period', $payment['package_pay_period'], true );
}
if (isset($cart_item['_wiaas_standard_package'])) {
$order_item->add_meta_data( '_wiaas_standard_package', $cart_item['_wiaas_standard_package'], true );
}
if (isset($cart_item['_wiaas_currency'])) {
$order_item->add_meta_data( '_wiaas_currency', $cart_item['_wiaas_currency'], true );
}
// add options metadata
if (isset($cart_item['_wiaas_option_items'])) {
$order_item->add_meta_data( '_wiaas_option_items', $cart_item['_wiaas_option_items'] );
}
if (isset($cart_item['_wiaas_option_for'])) {
$order_item->add_meta_data( '_wiaas_option_for', $cart_item['_wiaas_option_for'], true );
}
if (isset($cart_item['_wiaas_option_group_name'])) {
$order_item->add_meta_data( '_wiaas_option_group_name', $cart_item['_wiaas_option_group_name'], true );
}
// add addons metadata
if (isset($cart_item['_wiaas_addon_items'])) {
$order_item->add_meta_data( '_wiaas_addon_items', $cart_item['_wiaas_addon_items'] );
}
if (isset($cart_item['_wiaas_addon_for'])) {
$order_item->add_meta_data( '_wiaas_addon_for', $cart_item['_wiaas_addon_for'], true );
}
}
/**
* Mark extended properties for order as hidden
* @param $hidden
*
* @return array
*/
public static function hidden_order_item_meta( $hidden ) {
return array_merge( $hidden, array(
'_wiaas_payment_type',
'_wiaas_services_extra',
'_wiaas_service_contract_period',
'_wiaas_max_contract_period',
'_wiaas_period_unit',
'_wiaas_recurrent_extra',
'_wiaas_pay_period',
'_wiaas_addon_items',
'_wiaas_addon_for',
'_wiaas_option_items',
'_wiaas_option_for',
'_wiaas_option_group_name',
'_wiaas_standard_package',
'_wiaas_currency',
) );
}
/**
* Calculate total cost for cart item
*
* @param $cart_item
*
* @return array
*/
public static function get_cart_item_total($cart_item) {
$package_price = isset($cart_item['_wiaas_payment']) ? $cart_item['_wiaas_payment'] : array(
'fixed_extra' => 0,
'services_extra' => 0,
'recurrent_extra' => 0
);
$total_fixed_extra = $package_price['fixed_extra'];
$total_services_extra = $package_price['services_extra'];
$total_recurrent_extra = $package_price['recurrent_extra'];
$cart_item_addons = wiaas_get_cart_item_addons($cart_item);
foreach ($cart_item_addons as $cart_item_addon) {
$addon_price = $cart_item_addon['_wiaas_payment'];
$total_fixed_extra += $addon_price['fixed_extra'];
$total_services_extra += $addon_price['services_extra'];
$total_recurrent_extra += $addon_price['recurrent_extra'];
}
$cart_item_options = wiaas_get_cart_item_options($cart_item);
foreach ($cart_item_options as $cart_item_option) {
$option_price = $cart_item_option['_wiaas_payment'];
$total_fixed_extra += $option_price['fixed_extra'];
$total_services_extra += $option_price['services_extra'];
$total_recurrent_extra += $option_price['recurrent_extra'];
}
return array(
'fixed_extra' => $total_fixed_extra,
'services_extra' => $total_services_extra,
'recurrent_extra' => $total_recurrent_extra
);
}
//PRIVATE
/**
* Add selected package options to cart
* @param $cart_item_key
* @param $package_id
* @param $cart_item_data
*
* @throws Exception
*/
private static function _add_options_to_cart($cart_item_key, $package_id, $cart_item_data) {
$is_option_parent = $_POST['package_id'] = $package_id && isset($cart_item_data['_wiaas_option_items']);
$has_selected_options = isset($_POST['options']) && is_array($_POST['options']);
if ($is_option_parent && $has_selected_options) {
$options_ids = $_POST['options'];
foreach ($options_ids as $option_id) {
$option_package = wc_get_product($option_id);
if (is_object($option_package)) {
$option_cart_item_key = WC()->cart->add_to_cart($option_id, 1, 0, array(), array(
'_wiaas_option_for' => $cart_item_key
));
if ($option_cart_item_key) {
WC()->cart->cart_contents[ $cart_item_key ]['_wiaas_option_items'][] = $option_cart_item_key;
}
}
}
}
}
/**
* Add selected package addons to cart
*
* @param $cart_item_key
* @param $package_id
* @param $cart_item_data
*
* @throws Exception
*/
private static function _add_addons_to_cart($cart_item_key, $package_id, $cart_item_data) {
$is_addon_parent = $_POST['package_id'] = $package_id && isset($cart_item_data['_wiaas_addon_items']);
$has_selected_addons = isset($_POST['addons']) && is_array($_POST['addons']);
if ($is_addon_parent && $has_selected_addons) {
$addons_ids = $_POST['addons'];
foreach ($addons_ids as $addon_id) {
$addon_package = wc_get_product($addon_id);
if (is_object($addon_package)) {
$addon_cart_item_key = WC()->cart->add_to_cart($addon_id, 1, 0, array(), array(
'_wiaas_addon_for' => $cart_item_key
));
if ($addon_cart_item_key) {
WC()->cart->cart_contents[ $cart_item_key ]['_wiaas_addon_items'][] = $addon_cart_item_key;
}
}
}
}
}
}
Wiaas_Cart::init();

104
backend/app/plugins/wiaas/includes/class-wiaas-countries.php Normal file
View File

@@ -0,0 +1,104 @@
<?php
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
}
/**
* Implements available wiaas countries
*
* Class Wiaas_Countries
*/
class Wiaas_Countries {
/**
* Available countries for wiaas
* @var array
*/
private static $available_countries = array(
'Sweden' => array(
'name' => 'Sweden',
'code' => 'se',
'vat' => 9 ,
'currency' => 'SEK'
),
'Denmark' => array(
'name' => 'Denmark',
'code' => 'dk',
'vat' => 9 ,
'currency' => 'DKK'
),
'Finland' => array(
'name' => 'Finland',
'code' => 'fi',
'vat' => 9 ,
'currency' => 'EUR'
),
);
public static function init() {
add_action('woocommerce_after_register_taxonomy', array(__CLASS__, 'register_product_countries_taxonomy'));
}
/**
* Registers product taxonomy for avaiable countries
*/
public static function register_product_countries_taxonomy() {
$labels = array(
'name' => _x( 'Country', 'taxonomy general name', 'wiaas' ),
'singular_name' => _x( 'Country', 'taxonomy singular name', 'wiaas' ),
'menu_name' => _x( 'Country', 'Admin menu name', 'wiaas' ),
'search_items' => __( 'Search Countries', 'wiaas' ),
'all_items' => __( 'All Countries', 'wiaas' ),
'parent_item' => __( 'Parent Country', 'wiaas' ),
'parent_item_colon' => __( 'Parent Country:', 'wiaas' ),
'edit_item' => __( 'Edit Country', 'wiaas' ),
'update_item' => __( 'Update Country', 'wiaas' ),
'add_new_item' => __( 'Add New Country', 'wiaas' ),
'new_item_name' => __( 'New Country Name', 'wiaas' ),
);
$args = array(
'hierarchical' => false,
'label' => __( 'Countries', 'wiaas' ),
'labels' => $labels,
'show_ui' => true,
'show_admin_column' => true,
'query_var' => true,
'rewrite' => array( 'slug' => 'product_country' ),
);
register_taxonomy( 'product_country', array( 'product' ), $args );
foreach (self::$available_countries as $available_country) {
wp_insert_term($available_country['name'], 'product_country');
}
}
/**
* Retrieves country for provided package
* @param $package
*
* @return array|null
*/
public static function get_package_country($package) {
return self::get_product_country($package);
}
/**
* Retrieves country for provided product
* @param $product
*
* @return array|null
*/
public static function get_product_country($product) {
$product_country = get_the_terms($product->get_id(), 'product_country');
return is_array($product_country) && isset($product_country[0]) ?
self::$available_countries[$product_country[0]->name] :
null;
}
}
Wiaas_Countries::init();

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

@@ -11,7 +11,9 @@ class Wiaas_DB_Update {
'20180807222206' => 'wiaas_db_update_setup_customer_capabilities', '20180807222206' => 'wiaas_db_update_setup_customer_capabilities',
'20180811134511' => 'wiaas_db_update_enable_orders_access_management', '20180811134511' => 'wiaas_db_update_enable_orders_access_management',
'20180813134511' => 'wiaas_db_update_enable_order_numbers', '20180813134511' => 'wiaas_db_update_enable_order_numbers',
'20180826153509' => 'wiaas_create_broker_access_group' '20180826153509' => 'wiaas_create_broker_access_group',
'20180911101010' => 'wiaas_db_setup_exclusive_taxonomies',
'20180912101010' => 'wiaas_db_setup_default_cl'
); );
public static function execute() { public static function execute() {

103
backend/app/plugins/wiaas/includes/class-wiaas-documents.php Normal file
View File

@@ -0,0 +1,103 @@
<?php
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
}
/**
* Implements Wiaas Document types
*
* Class Wiaas_Documents
*/
class Wiaas_Documents {
/**
* Default available document types for wiaas
* @var array
*/
private static $available_doc_types = array(
'template_questionaire' => array(
'name' => 'Template Questionaire',
'is_special_type' => false,
),
'order_questionaire' => array(
'name' => 'Order Questionaire',
'is_special_type' => true,
),
'configuration' => array(
'name' => 'Configuration',
'is_special_type' => true,
),
'install_guide' => array(
'name' => 'Install guide',
'is_special_type' => false,
),
'customer_acceptance' => array(
'name' => 'Customer acceptance',
'is_special_type' => true,
),
'template_agreement' => array(
'name' => 'Template Agreement',
'is_special_type' => false,
),
'order_agreement' => array(
'name' => 'Order Agreement',
'is_special_type' => true,
),
'installation_protocol' => array(
'name' => 'Installation protocol',
'is_special_type' => true,
),
'statements' => array(
'name' => 'Statements',
'is_special_type' => false,
),
'customer_acceptance_template' => array(
'name' => 'Customer acceptance template',
'is_special_type' => false,
),
);
public static function init() {
add_action( 'init', array( __CLASS__, 'register_wiaas_document_types' ));
}
/**
* Registers taxonomy and default values for wiaas document types
*/
public static function register_wiaas_document_types() {
$labels = array(
'name' => _x( 'Document type', 'taxonomy general name', 'wiaas' ),
'singular_name' => _x( 'Document type', 'taxonomy singular name', 'wiaas' ),
'menu_name' => _x( 'Document types', 'Admin menu name', 'wiaas' ),
'search_items' => __( 'Search Document types', 'wiaas' ),
'all_items' => __( 'All Document types', 'wiaas' ),
'parent_item' => __( 'Parent Document type', 'wiaas' ),
'parent_item_colon' => __( 'Parent Document type:', 'wiaas' ),
'edit_item' => __( 'Edit Document type', 'wiaas' ),
'update_item' => __( 'Update Document type', 'wiaas' ),
'add_new_item' => __( 'Add New Document type', 'wiaas' ),
'new_item_name' => __( 'New Document type Name', 'wiaas' ),
);
$args = array(
'hierarchical' => false,
'label' => __( 'Document types', 'wiaas' ),
'labels' => $labels,
'show_ui' => true,
'show_admin_column' => true,
'query_var' => true,
'rewrite' => array( 'slug' => 'wiaas_document_types' ),
);
register_taxonomy( 'wiaas_document_types', array( 'attachment' ), $args );
foreach (self::$available_doc_types as $key => $available_doc_type) {
wp_insert_term($available_doc_type['name'], 'wiaas_document_types', array(
'slug' => $key
));
}
}
}
Wiaas_Documents::init();

79
backend/app/plugins/wiaas/includes/class-wiaas-order.php
View File

@@ -1,5 +1,10 @@
<?php <?php
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
}
/** /**
* Class Wiaas_Order * Class Wiaas_Order
* *
@@ -96,9 +101,6 @@ class Wiaas_Order {
$data = $response->get_data(); $data = $response->get_data();
# apply overrides # apply overrides
$data = self::_append_products_info($data, $order, $request);
$data = self::_append_order_process($data, $order, $request);
$data = self::_append_customer_info($data, $order, $request); $data = self::_append_customer_info($data, $order, $request);
@@ -106,7 +108,14 @@ class Wiaas_Order {
$data = self::_append_wiaas_order_details($data, $order, $request); $data = self::_append_wiaas_order_details($data, $order, $request);
$data = self::_append_packages($data, $order, $request);
if (isset($request['id'])) {
$data = self::_append_order_process($data, $order, $request);
$data = self::_append_order_comments($data, $order, $request); $data = self::_append_order_comments($data, $order, $request);
}
$response->set_data($data); $response->set_data($data);
@@ -182,27 +191,26 @@ class Wiaas_Order {
* *
* @return mixed * @return mixed
*/ */
private static function _append_products_info($data, $order, $request) { private static function _append_packages($data, $order, $request) {
$line_items = array(); $line_items = array();
$order_items = $order->get_items( 'line_item' );
foreach ($data['line_items'] as $index => $product_line) { foreach ($data['line_items'] as $index => $product_line) {
// add only product lines that represent product bundles
if (empty($product_line['bundled_by'])) {
$item = $order->get_item($product_line['id']); $item = $order->get_item($product_line['id']);
$payment = $item->get_meta('_wiaas_payment', true);
# lock all products to `Purchase` payment type // add only product lines that represent product bundles
$product_line['payment_type'] = $payment['payment_type']; if (isset($item['wiaas_standard_package'])) {
# lock all products to have no service # get payment type info
$product_line['service_price'] = $payment['minimal_services_price']; $product_line['payment_type'] = $item['wiaas_payment_type'];
$product_line['service_contract_period'] = $payment['services_contract_period']; $product_line['service_price'] = floatval($item['wiaas_services_extra']);
$product_line['max_contract_period'] = $payment['max_contract_period']; $product_line['service_contract_period'] = floatval($item['wiaas_service_contract_period']);
$product_line['period_unit'] = $payment['period_unit']; $product_line['max_contract_period'] = floatval($item['wiaas_max_contract_period']);
$product_line['period_unit'] = $item['wiaas_period_unit'];
# simplify payment for all products $product_line['recurring_price'] = floatval($item['wiaas_recurrent_extra']);
$product_line['recurring_price'] = $payment['recurrent_price']; $product_line['pay_period'] = floatval($item['wiaas_pay_period']);
$product_line['pay_period'] = $payment['package_pay_period'];
# collect status from order # collect status from order
if ($data['status'] === 'completed') { if ($data['status'] === 'completed') {
@@ -212,16 +220,51 @@ class Wiaas_Order {
} else { } else {
$product_line['status'] = 'processing'; $product_line['status'] = 'processing';
} }
$product_line['short_desc'] = $product_line['status']; $product_line['short_desc'] = $product_line['status'];
# collect completion data from order # collect completion data from order
$product_line['date_completed'] = $data['date_completed']; $product_line['date_completed'] = $data['date_completed'];
if (isset($request['id'])) {
// collect package addons
$product_line['additional_packages'] = array();
$addon_items = wiaas_get_order_item_addons($order_items, $item);
foreach ($addon_items as $addon_item) {
$product_line['additional_packages'][] = array(
'id' => $addon_item->get_id(),
'name' => $addon_item->get_name(),
);
}
// collect package options
$product_line['options'] = array();
$option_items = wiaas_get_order_item_options($order_items, $item);
foreach ($option_items as $option_item) {
$product_line['options'][] = array(
'id' => $option_item->get_id(),
'name' => $option_item->get_name(),
'group_name' => $option_item['wiaas_option_group_name']
);
}
}
$line_items[] = $product_line; $line_items[] = $product_line;
} }
} }
$data['line_items'] = $line_items; $data['line_items'] = $line_items;
$total_recurring_price = 0;
foreach ($order_items as $order_item) {
if (isset($order_item['wiaas_standard_package'])) {
$total_recurring_price += floatval($order_item['quantity']) * floatval($order_item['wiaas_services_extra']) +
floatval($order_item['quantity']) * floatval($order_item['wiaas_recurrent_extra']);
}
}
$data['recurring_price'] = $total_recurring_price;
return $data; return $data;
} }

117
backend/app/plugins/wiaas/includes/class-wiaas-package.php
View File

@@ -1,9 +1,19 @@
<?php <?php
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
}
class Wiaas_Package { class Wiaas_Package {
public static function init() { public static function init() {
require_once dirname( __FILE__ ) . '/package/class-wiaas-package-pricing.php'; require_once dirname( __FILE__ ) . '/package/class-wiaas-package-addon.php';
require_once dirname( __FILE__ ) . '/package/class-wiaas-package-option-groups.php';
require_once dirname( __FILE__ ) . '/package/class-wiaas-package-type.php';
require_once dirname( __FILE__ ) . '/package/wiaas-package-functions.php';
add_filter('woocommerce_rest_prepare_product_object', array(__CLASS__, 'transform_rest_package'), 999, 3); add_filter('woocommerce_rest_prepare_product_object', array(__CLASS__, 'transform_rest_package'), 999, 3);
} }
@@ -14,30 +24,125 @@ class Wiaas_Package {
* @param $package * @param $package
* @param $request * @param $request
* *
* @return mixed * @return array
*/ */
public static function transform_rest_package($response, $package, $request) { public static function transform_rest_package($response, $package, $request) {
$data = $response->get_data(); $data = $response->get_data();
$data = self::_append_country_info($data, $package, $request);
if (isset($request['id'])) {
$data = self::_append_package_prices($data, $package, $request); $data = self::_append_package_prices($data, $package, $request);
$data = self::_append_documents_info($data, $package, $request);
$data = self::_append_additional_packages($data, $package, $request);
}
$response->set_data($data); $response->set_data($data);
return $response; return $response;
} }
/**
* Append package documents
* @param $data
* @param $package
* @param $request
*
* @return array
*/
private static function _append_documents_info($data, $package, $request) {
unset($data['downloads']);
$data['documents'] = array_map(function($download) {
return array(
'id' => $download->get_id(),
'name' => $download->get_name(),
'extension' => $download->get_file_extension(),
);
}, array_values($package->get_downloads()));
return $data;
}
/**
* Append package country and currency info
* @param $data
* @param $package
* @param $request
*
* @return array
*/
private static function _append_country_info($data, $package, $request) {
$package_country = Wiaas_Countries::get_package_country($package);
if (isset($package_country)) {
$data['country'] = $package_country['name'];
$data['country_code'] = $package_country['code'];
$data['currency'] = $package_country['currency'];
}
return $data;
}
/**
* Append package addons and options
* @param $data
* @param $package
* @param $request
*
* @return array
*/
private static function _append_additional_packages($data, $package, $request) {
$data['additional_packages'] = array();
$addons = Wiaas_Package_Addon::get_package_addons($package);
foreach ($addons as $addon) {
$data['additional_packages'][] = array(
'id' => $addon->get_id(),
'name' => $addon->get_name(),
'description' => $addon->get_description(),
'prices' => Wiaas_Pricing::get_addon_package_customer_price($addon, $package),
);
}
$data['groups'] = array();
$option_groups = Wiaas_Package_Option_Groups::get_package_option_groups($package);
foreach ($option_groups as $option_group) {
$data['groups'][$option_group['id']] = array(
'id' => $option_group['id'],
'name' => $option_group['name'],
'default' => $option_group['default'],
'options' => array()
);
$default_option_id = (int) $option_group['default'];
foreach ($option_group['options'] as $option_package) {
$data['groups'][$option_group['id']]['options'][] = array(
'id' => $option_package->get_id(),
'name' => $option_package->get_name(),
'description' => $option_package->get_description(),
'default' => $default_option_id === $option_package->get_id(),
'prices' => Wiaas_Pricing::get_option_package_customer_price($option_package, $package),
);
}
}
return $data;
}
/** /**
* Append configured package prices on package json response * Append configured package prices on package json response
* @param $data * @param $data
* @param $package * @param $package
* @param $request * @param $request
* *
* @return mixed * @return array
*/ */
private static function _append_package_prices($data, $package, $request) { private static function _append_package_prices($data, $package, $request) {
$package_prices = array_values(Wiaas_Package_Pricing::get_package_prices($package)); $data['prices'] = Wiaas_Pricing::get_standard_package_customer_prices($package);
$data['prices'] = $package_prices;
return $data; return $data;
} }

241
backend/app/plugins/wiaas/includes/class-wiaas-pricing.php Normal file
View File

@@ -0,0 +1,241 @@
<?php
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
}
/**
* Class Wiaas_Pricing
*/
class Wiaas_Pricing {
/**
* Wiaas interest rate
*/
const INTEREST_RATE = 0.58;
const COMMERCIAL_LEAD_NAME = 'Coor Service Management';
public static function init() {
require_once dirname( __FILE__ ) . '/pricing/class-wiaas-product-pricing.php';
require_once dirname( __FILE__ ) . '/pricing/class-wiaas-package-pricing.php';
require_once dirname( __FILE__ ) . '/pricing/wiaas-pricing-functions.php';
}
/**
* Calculates total cost for product
* @param $product
*
* @return float
*/
public static function get_product_total_cost($product) {
$product_price = Wiaas_Product_Pricing::get_product_price($product);
return $product_price['is_recurring'] ?
$product_price['price'] * $product_price['pay_period'] :
$product_price['price'];
}
/**
* Calculates total cost for package
* @param $package
*
* @return float
*/
public static function get_package_total_cost($package) {
$total_cost_per_category = array();
$bundled_items = $package->get_bundled_items();
foreach ($bundled_items as $bundled_item) {
$product = $bundled_item->product;
$product_cat = Wiaas_Product_Category::get_category($product);
if (!isset($total_cost_per_category[$product_cat])) {
$total_cost_per_category[$product_cat] = 0;
}
$total_item_cost = self::get_product_total_cost($product) * $bundled_item->get_quantity();
if (Wiaas_Product_Category::is_installation($product)) {
$total_cost_per_category[$product_cat] += $total_cost_per_category[$product_cat] < $total_item_cost ?
$total_item_cost :
$total_cost_per_category[$product_cat];
} else {
$total_cost_per_category[$product_cat] += $total_item_cost;
}
}
return array_sum(array_values($total_cost_per_category));
}
/**
* Calculates customer price for wiaas standard package
* @param $package
*
* @return array
*/
public static function get_standard_package_customer_prices($package) {
$is_same_company_as_cl = self::_is_customer_same_company_as_cl();
$package_prices = Wiaas_Package_Pricing::get_package_prices($package);
$cl_commision = (100 - Wiaas_Package_Pricing::get_package_pricing_commission($package)) / 100;
$total_cost = self::get_package_total_cost($package);
$customer_package_prices = array();
foreach ($package_prices as $type => $package_price) {
$customer_package_prices[] = self::_get_package_customer_price(
$package_price,
$cl_commision,
$total_cost,
$is_same_company_as_cl);
}
return $customer_package_prices;
}
/**
* Calculates customer price for wiaas addon package
* @param $addon_package
* @param $parent_package
*
* @return array
*/
public static function get_addon_package_customer_price($addon_package, $parent_package) {
$is_same_company_as_cl = self::_is_customer_same_company_as_cl();
$parent_total_cost = self::get_package_total_cost($parent_package);
$parent_cl_commision = (100 - Wiaas_Package_Pricing::get_package_pricing_commission($parent_package)) / 100;
$addon_package_prices = Wiaas_Package_Pricing::get_package_prices($addon_package);
$customer_package_prices = array();
foreach ($addon_package_prices as $type => $addon_package_price) {
$customer_package_prices[] = self::_get_package_customer_price(
$addon_package_price,
$parent_cl_commision,
$parent_total_cost,
$is_same_company_as_cl);
}
return $customer_package_prices;
}
/**
* Calculates customer price for wiaas option package
* @param $option_package
* @param $parent_package
*
* @return array
*/
public static function get_option_package_customer_price($option_package, $parent_package) {
$is_same_company_as_cl = self::_is_customer_same_company_as_cl();
$parent_total_cost = self::get_package_total_cost($parent_package);
$parent_cl_commision = (100 - Wiaas_Package_Pricing::get_package_pricing_commission($parent_package)) / 100;
$option_package_prices = Wiaas_Package_Pricing::get_package_prices($option_package);
$customer_package_prices = array();
foreach ($option_package_prices as $type => $option_package_price) {
$customer_package_prices[] = self::_get_package_customer_price(
$option_package_price,
$parent_cl_commision,
$parent_total_cost,
$is_same_company_as_cl);
}
return $customer_package_prices;
}
// PRIVATE
/**
* Determines if customer and commercial lead are in the same company
* For now this is hardcoded and we have only one CL
*
* TODO: This should be changed after customer leads are handled
* @return bool
*/
private static function _is_customer_same_company_as_cl() {
$current_user = wp_get_current_user();
$user_organization = Wiaas_User_Organization::get_user_organization($current_user->ID);
$is_same_company_as_cl = $user_organization->name === self::COMMERCIAL_LEAD_NAME;
return $is_same_company_as_cl;
}
/**
* Calculates customer price for wiaas package
* @param $package_price
* @param $cl_commision
* @param $total_cost
* @param $is_same_company_as_cl
*
* @return array
*/
private static function _get_package_customer_price($package_price, $cl_commision, $total_cost, $is_same_company_as_cl) {
$package_total_margin = wiaas_get_price_margin(
$package_price['minimal_fixed_price'],
$package_price['principal_amount'],
$total_cost);
$cl_margin = $package_total_margin > 0 ? $package_total_margin * $cl_commision : 0;
$cl_package_prices = array(
'fixed_extra' => 0,
'recurrent_extra' => 0,
'services_extra' => 0
);
$interest_rate = self::INTEREST_RATE;
$customer_price = array(
'id' => $package_price['id'],
'payment_type' => $package_price['payment_type'],
'max_contract_period' => $package_price['max_contract_period'],
'package_pay_period' => $package_price['package_pay_period'],
'period_unit' => $package_price['period_unit'],
'services_contract_period' => $package_price['services_contract_period'],
'fixed_extra' => 0,
'recurrent_extra' => 0,
'services_extra' => 0
);
if ($is_same_company_as_cl) {
if ($package_price['package_pay_period'] > 0) {
$customer_price['fixed_extra'] = $package_price['minimal_fixed_price'];
$customer_price['recurrent_extra'] = wiaas_get_recurrent_price_mortage(
$package_price['principal_amount'],
$package_price['package_pay_period'],
$cl_margin,
$interest_rate);
} else {
$customer_price['fixed_extra'] = $package_price['minimal_fixed_price'] - $cl_margin;
$customer_price['recurrent_extra'] = 0;
}
$customer_price['services_extra'] = $package_price['minimal_services_price'];
} else {
$customer_price['fixed_extra'] = $cl_package_prices['fixed_extra'] + $package_price['minimal_fixed_price'];
$customer_price['recurrent_extra'] = $package_price['package_pay_period'] > 0 ?
$cl_package_prices['recurrent_extra'] + wiaas_get_recurrent_price_mortage(
$package_price['principal_amount'],
$package_price['package_pay_period'],
0,
$interest_rate)
: 0;
$customer_price['services_extra'] = $cl_package_prices['services_extra'] + $package_price['minimal_services_price'];
}
return $customer_price;
}
}
Wiaas_Pricing::init();

10
backend/app/plugins/wiaas/includes/class-wiaas-product.php Normal file
View File

@@ -0,0 +1,10 @@
<?php
class Wiaas_Product {
public static function init() {
require_once dirname( __FILE__ ) . '/product/class-wiaas-product-category.php';
}
}
Wiaas_Product::init();

15
backend/app/plugins/wiaas/includes/db-updates/wiaas-db-update-functions.php
View File

@@ -111,3 +111,18 @@ function wiaas_create_broker_access_group() {
'name' => 'Broker', 'name' => 'Broker',
)); ));
} }
function wiaas_db_setup_exclusive_taxonomies() {
update_option('radio_button_for_taxonomies_options', array(
'taxonomies' => array(
'product_cat',
'product_country',
'wiaas_document_types',
),
'delete' => 0,
));
}
function wiaas_db_setup_default_cl() {
wp_insert_term(Wiaas_Pricing::COMMERCIAL_LEAD_NAME, Wiaas_User_Organization::TAXONOMY_NAME);
}

63
backend/app/plugins/wiaas/includes/package/class-wiaas-package-addon.php Normal file
View File

@@ -0,0 +1,63 @@
<?php
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
}
/**
* Implements addons for standard wiaas package types
*
* Class Wiaas_Package_Addon
*/
class Wiaas_Package_Addon {
public static function init() {
add_filter('wiaas_package_types', array( __CLASS__, 'register_addon_package_type' ) );
}
/**
* Registers addon as available wiaas package type
* @param $package_types
*
* @return array
*/
public static function register_addon_package_type($package_types) {
$package_types[] = 'add_on';
return $package_types;
}
/**
* Retrieves addons configured for provided wiaas standard package type
* @param $package
*
* @return array
*/
public static function get_package_addons($package) {
$addon_ids = $package->get_meta( '__wiaas_package_addons' );
$addons = array();
foreach ($addon_ids as $addon_id) {
$addon_package = wc_get_product( $addon_id );
if (is_object($addon_package)) {
$addons[] = $addon_package;
}
}
return $addons;
}
/**
* Sets addons for provided wiaas standard package type
* @param $package
* @param $children_ids
*/
public static function set_package_addons($package, $children_ids) {
$package->update_meta_data( '__wiaas_package_addons', $children_ids );
$package->save_meta_data();
}
}
Wiaas_Package_Addon::init();

95
backend/app/plugins/wiaas/includes/package/class-wiaas-package-option-groups.php Normal file
View File

@@ -0,0 +1,95 @@
<?php
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
}
/**
* Implementas groups of optional packages available for wiaas standard package type
*
* Class Wiaas_Package_Option_Groups
*/
class Wiaas_Package_Option_Groups {
public static function init() {
add_filter('wiaas_package_types', array( __CLASS__, 'register_option_package_type' ) );
}
/**
* Register option as ne of available wiaas package types
* @param $package_types
*
* @return array
*/
public static function register_option_package_type($package_types) {
$package_types[] = 'option';
return $package_types;
}
/**
* Retrives options group name for package option
* @param $package
* @param $option_package
*
* @return string|null
*/
public static function get_group_name_for_package_option($package, $option_package) {
$option_groups = $package->get_meta( '_wiaas_package_option_groups' );
foreach ($option_groups as $option_group) {
foreach ($option_group['options'] as $group_option_id) {
if ((int) $group_option_id === $option_package->get_id()) {
return $option_group['name'];
}
}
}
return null;
}
/**
* Retrieve groups of optional packages configured for provided package
* @param $package
*
* @return array
*/
public static function get_package_option_groups($package) {
$groups_data = $package->get_meta( '_wiaas_package_option_groups' );
$option_groups = array();
foreach ($groups_data as $group_data) {
$group = array(
'id' => $group_data['id'],
'name' => $group_data['name'],
'default' => $group_data['default'],
'options' => array()
);
foreach ($group_data['options'] as $option_id) {
$option_package = wc_get_product( $option_id );
if (is_object($option_package)) {
$group['options'][] = $option_package;
}
}
$option_groups[] = $group;
}
return $option_groups;
}
/**
* Set groups of optional packages for provided package
* @param $package
* @param $groups_data
*/
public static function set_package_option_groups($package, $groups_data) {
$package->update_meta_data( '_wiaas_package_option_groups', $groups_data );
$package->save_meta_data();
}
}
Wiaas_Package_Option_Groups::init();

103
backend/app/plugins/wiaas/includes/package/class-wiaas-package-type.php Normal file
View File

@@ -0,0 +1,103 @@
<?php
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
}
/**
* Class Wiaas_Package_Type
*/
class Wiaas_Package_Type {
public static function init() {
add_action('init', array( __CLASS__, 'register_package_type_taxonomy' ) );
}
/**
* Register wiaas package type taxonomy
*/
public static function register_package_type_taxonomy() {
$labels = array(
'name' => _x( 'Package type', 'taxonomy general name', 'wiaas' ),
'singular_name' => _x( 'Package type', 'taxonomy singular name', 'wiaas' ),
'search_items' => __( 'Search Package types', 'wiaas' ),
'all_items' => __( 'All Package types', 'wiaas' ),
'parent_item' => __( 'Parent Package type', 'wiaas' ),
'parent_item_colon' => __( 'Parent Package type:', 'wiaas' ),
'edit_item' => __( 'Edit Package type', 'wiaas' ),
'update_item' => __( 'Update Package type', 'wiaas' ),
'add_new_item' => __( 'Add New Package type', 'wiaas' ),
'new_item_name' => __( 'New Package type Name', 'wiaas' ),
'menu_name' => __( 'Package type', 'wiaas' ),
);
$args = array(
'hierarchical' => false,
'labels' => $labels,
'show_ui' => false,
'show_admin_column' => true,
'query_var' => true,
'rewrite' => array( 'slug' => 'package_type' ),
);
register_taxonomy( 'package_type', array( 'product' ), $args );
// Register available package types
// standard package type is default package type for wiaas packages
$types = apply_filters('wiaas_package_types', array('standard'));
foreach ($types as $type) {
wp_insert_term($type, 'package_type');
}
}
/**
* Retrieve available wiaas package types
* @return array
*/
public static function get_available_package_types() {
$types = get_terms( array(
'taxonomy' => 'package_type',
'hide_empty' => false,
) );
return array_map(function($type) {
return $type->name;
}, $types);
}
/**
* Retrieve package type for provided package id
* @param $package_id
*
* @return null
*/
public static function get_package_type($package_id) {
$terms = wp_get_object_terms($package_id, 'package_type');
$package_type = isset($terms[0]) ? $terms[0]->name : null;
return $package_type;
}
/**
* Set package type for provided package id
* @param $package_id
* @param $type
*/
public static function set_package_type($package_id, $type) {
wp_delete_object_term_relationships( $package_id, 'package_type' );
if (isset($type)) {
wp_set_object_terms($package_id, $type, 'package_type', false);
}
}
}
Wiaas_Package_Type::init();

91
backend/app/plugins/wiaas/includes/package/wiaas-package-functions.php Normal file
View File

@@ -0,0 +1,91 @@
<?php
/**
* Collect optional packages for provided order item package
* @param $order_items
* @param $parent_order_item
*
* @return array
*/
function wiaas_get_order_item_options($order_items, $parent_order_item) {
$option_order_items = array();
if (isset($parent_order_item['wiaas_option_items']) && isset($parent_order_item['bundle_cart_key'])) {
foreach ($order_items as $order_item) {
if (isset($order_item['bundle_cart_key']) && $order_item['wiaas_option_for'] === $parent_order_item['bundle_cart_key']) {
$option_order_items[] = $order_item;
}
}
}
return $option_order_items;
}
/**
* Collect optional packages cart items for provided cart item
* @param $cart_item
*
* @return array
*/
function wiaas_get_cart_item_options($cart_item) {
$option_cart_items = array();
if (isset($cart_item['_wiaas_option_items'])) {
$option_cart_items_ids = $cart_item['_wiaas_option_items'];
foreach ($option_cart_items_ids as $option_cart_item_id) {
$option_cart_item = WC()->cart->get_cart_item($option_cart_item_id);
if (isset($option_cart_item)) {
$option_cart_items[] = $option_cart_item;
}
}
}
return $option_cart_items;
}
/**
* Collect addon packages for provided order item package
* @param $order_items
* @param $parent_order_item
*
* @return array
*/
function wiaas_get_order_item_addons($order_items, $parent_order_item) {
$addon_order_items = array();
if (isset($parent_order_item['wiaas_addon_items']) && isset($parent_order_item['bundle_cart_key'])) {
foreach ($order_items as $order_item) {
if (isset($order_item['bundle_cart_key']) && $order_item['wiaas_addon_for'] === $parent_order_item['bundle_cart_key']) {
$addon_order_items[] = $order_item;
}
}
}
return $addon_order_items;
}
/**
* Collect addon packages cart items for provided cart item
* @param $cart_item
*
* @return array
*/
function wiaas_get_cart_item_addons($cart_item) {
$addon_cart_items = array();
if (isset($cart_item['_wiaas_addon_items'])) {
$addon_cart_items_ids = $cart_item['_wiaas_addon_items'];
foreach ($addon_cart_items_ids as $addon_cart_item_id) {
$addon_cart_item = WC()->cart->get_cart_item($addon_cart_item_id);
if (isset($addon_cart_item)) {
$addon_cart_items[] = $addon_cart_item;
}
}
}
return $addon_cart_items;
}

122
backend/app/plugins/wiaas/includes/package/class-wiaas-package-pricing.php → backend/app/plugins/wiaas/includes/pricing/class-wiaas-package-pricing.php
View File

@@ -1,5 +1,9 @@
<?php <?php
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
}
/** /**
* Class Wiaas_Package_Pricing * Class Wiaas_Package_Pricing
*/ */
@@ -44,17 +48,27 @@ class Wiaas_Package_Pricing {
'minimal_services_price' => 0 'minimal_services_price' => 0
); );
/**
* Meta key for pricing rules
* @var string
*/
private static $package_prices_meta_key = '_wiaas_pricing_rules';
public static function init() { public static function init() {
add_filter( 'woocommerce_product_get_price', array( __CLASS__, 'on_get_price' ), 10, 2 ); add_filter('woocommerce_bundle_price_html', array( __CLASS__, 'get_package_price_html' ), 10, 2);
}
add_filter('woocommerce_checkout_create_order_line_item_object', array( __CLASS__, 'record_price_for_order_line_item' ), 10, 4); public static function get_package_price_html($price_html, $package) {
$bundled_items = $package->get_bundled_items();
$recurring_price = 0;
foreach ($bundled_items as $bundled_item) {
$product = $bundled_item->product;
$product_price = Wiaas_Product_Pricing::get_product_price($product);
if ($product_price['is_recurring']) {
$recurring_price += $product_price['price'] * $bundled_item->get_quantity();
}
}
$price_html = 'Fixed: ' . $price_html . ' and ' . $recurring_price . ' / month';
return $price_html;
} }
/** /**
@@ -73,50 +87,6 @@ class Wiaas_Package_Pricing {
return self::$payment_fields; return self::$payment_fields;
} }
/**
* Retrieve customer selected package price from session when adding package to cart
* @param $base_price
* @param $product
*
* @return mixed
*/
public static function on_get_price($base_price, $package) {
if ( empty( $package ) ||
empty( $base_price ) ||
$package->get_type() !== 'bundle' ||
!isset(WC()->session)) {
return $base_price;
}
$result_price = $base_price;
$preferred_price_id = WC()->session->get('wiaas_price_' . $package->get_id(), null);
if (isset($preferred_price_id)) {
$prices = self::get_package_prices($package);
$preferred_price = $prices[$preferred_price_id];
$result_price = $preferred_price['minimal_fixed_price'];
}
return $result_price;
}
/**
* Persist used payment type informations for package in corresponding order line item
* @param $order_item
* @param $cart_item_key
* @param $cart_item
* @param $order
*
* @return mixed
*/
public static function record_price_for_order_line_item($order_item, $cart_item_key, $cart_item, $order) {
if (wc_pb_is_bundle_container_cart_item($cart_item)) {
$order_item->add_meta_data('_wiaas_payment', $cart_item['_wiaas_price']);
}
return $order_item;
}
/** /**
* Retrieve configured payment prices for package * Retrieve configured payment prices for package
* @param $package * @param $package
@@ -124,7 +94,33 @@ class Wiaas_Package_Pricing {
* @return array * @return array
*/ */
public static function get_package_prices($package) { public static function get_package_prices($package) {
$pricing_rules = $package->get_meta( self::$package_prices_meta_key ); return self::_get_package_prices($package);
}
public static function get_package_pricing_commission($package) {
return self::_get_package_pricing_commision($package);
}
/**
* Persist payment prices configuration for package
* @param $package
* @param $pricing_rules
*/
public static function set_package_prices($package, $pricing_rules, $commision) {
if ( isset( $pricing_rules ) ) {
$package->update_meta_data( '_wiaas_pricing_rules', $pricing_rules );
$package->update_meta_data('_package_pricing_commision', $commision, true);
} else {
$package->delete_meta_data( '_wiaas_pricing_rules' );
}
$package->save_meta_data();
}
// PRIVATE
private static function _get_package_prices($package) {
$pricing_rules = $package->get_meta( '_wiaas_pricing_rules' );
$commision = self::_get_package_pricing_commision($package);
$prices = array(); $prices = array();
foreach ($pricing_rules as $type => $pricing_rule) { foreach ($pricing_rules as $type => $pricing_rule) {
@@ -138,10 +134,10 @@ class Wiaas_Package_Pricing {
'package_pay_period' => floatval($pay_type['package_pay_period']), 'package_pay_period' => floatval($pay_type['package_pay_period']),
'period_unit' => $pay_type['period_unit'], 'period_unit' => $pay_type['period_unit'],
'services_contract_period' => $pay_type['services_contract_period'], 'services_contract_period' => $pay_type['services_contract_period'],
'commision_split' => $commision / 100.00,
'minimal_fixed_price' => floatval($pricing_rule['minimal_fixed_price']), 'minimal_fixed_price' => floatval($pricing_rule['minimal_fixed_price']),
'principal_amount' => floatval($pricing_rule['principal_amount']), 'principal_amount' => floatval($pricing_rule['principal_amount']),
'recurrent_price' => 0,
'minimal_services_price' => floatval($pricing_rule['minimal_services_price']), 'minimal_services_price' => floatval($pricing_rule['minimal_services_price']),
); );
} }
@@ -149,18 +145,14 @@ class Wiaas_Package_Pricing {
return $prices; return $prices;
} }
/** private static function _get_package_pricing_commision($package) {
* Persist payment prices configuration for package $commision = $package->get_meta( '_package_pricing_commision', true);
* @param $package
* @param $pricing_rules if (!isset($commision) || $commision === '') {
*/ return 50.00;
public static function set_package_prices($package, $pricing_rules) {
if ( isset( $pricing_rules ) ) {
$package->update_meta_data( self::$package_prices_meta_key, $pricing_rules );
} else {
$package->delete_meta_data( self::$package_prices_meta_key );
} }
$package->save_meta_data();
return (float) $commision;
} }
} }

139
backend/app/plugins/wiaas/includes/pricing/class-wiaas-product-pricing.php Normal file
View File

@@ -0,0 +1,139 @@
<?php
defined( 'ABSPATH' ) || exit;
/**
* Class Wiaas_Product_Pricing
*/
class Wiaas_Product_Pricing {
public static function init() {
add_filter('woocommerce_get_price_html', array(__CLASS__, 'get_product_price_html'), 10, 2);
add_filter('woocommerce_bundled_item_price', array(__CLASS__, 'get_bundled_product_fixed_price'), 10, 4);
add_filter('woocommerce_bundled_item_is_priced_individually', array(__CLASS__, 'is_bundled_product_price_fixed'), 10, 2);
add_filter('woocommerce_bundles_process_bundled_item_admin_data', array(__CLASS__, 'handle_bundled_product_pricing'));
}
/**
* Configures each bundled product to be priced individually as default setting
* @param $bundled_item_data
*
* @return mixed
*/
public static function handle_bundled_product_pricing($bundled_item_data) {
$bundled_item_data[ 'priced_individually' ] = 'yes';
return $bundled_item_data;
}
/**
* Checks if bunded product has fixed price
* @param $is_priced_individually
* @param $bundled_item
*
* @return bool
*/
public static function is_bundled_product_price_fixed($is_priced_individually, $bundled_item) {
$bundled_product = $bundled_item->product;
return isset($bundled_product) ?
!self::_get_is_product_price_recurring($bundled_product) :
false;
}
/**
* Retrives fixed price for bundled product
* @param $price
* @param $product
* @param $discount
* @param $bundled_item
*
* @return int
*/
public static function get_bundled_product_fixed_price($price, $product, $discount, $bundled_item) {
if (self::_get_is_product_price_recurring($product)) {
return 0;
}
return $price;
}
/**
* Builds html for product
* @param $price
* @param $object
*
* @return string
*/
public static function get_product_price_html($price, $object) {
if ($object instanceof WC_Product_Simple) {
$is_recurring = self::_get_is_product_price_recurring($object);
if ($is_recurring) {
$price .= ' / month';
}
}
return $price;
}
/**
* Retrieves product configured price
* @param $product
*
* @return array
*/
public static function get_product_price($product) {
$is_recurring = self::_get_is_product_price_recurring($product);
$pay_period = self::_get_product_price_pay_period($product);
return array(
'price' => $product->get_price(),
'is_recurring' => $is_recurring,
'pay_period' => $pay_period
);
}
/**
* Sets configured product price
* @param $product
* @param $price
* @param bool $is_recurring
* @param int $pay_period
*/
public static function set_product_price($product, $price, $is_recurring = false, $pay_period = 0) {
$product->set_price($price);
self::_set_is_product_price_recurring($product, $is_recurring);
self::_set_product_price_pay_period($product, $pay_period);
$product->save_meta_data();
}
// PRIVATE
private static function _get_is_product_price_recurring($product) {
return $product->get_meta( '_wiaas_is_product_price_recurring', true) === 'yes';
}
private static function _get_product_price_pay_period($product) {
return (int) $product->get_meta( '_wiaas_product_pay_period', true);
}
private static function _set_is_product_price_recurring($product, $is_recurring) {
$product->update_meta_data('_wiaas_is_product_price_recurring', $is_recurring ? 'yes' : 'no');
}
private static function _set_product_price_pay_period($product, $pay_period) {
$product->update_meta_data('_wiaas_product_pay_period', (int) $pay_period);
}
}
Wiaas_Product_Pricing::init();

51
backend/app/plugins/wiaas/includes/pricing/wiaas-pricing-functions.php Normal file
View File

@@ -0,0 +1,51 @@
<?php
/**
* Copy of Excel's PMT function.
* Credit: http://thoughts-of-laszlo.blogspot.nl/2012/08/complete-formula-behind-excels-pmt.html
*
* @param double $interest The interest rate for the loan.
* @param int $num_of_payments The total number of payments for the loan in months.
* @param double $PV The present value, or the total amount that a series of future payments is worth now;
* Also known as the principal.
* @param double $FV The future value, or a cash balance you want to attain after the last payment is made.
* If fv is omitted, it is assumed to be 0 (zero), that is, the future value of a loan is 0.
* @param int $Type Optional, defaults to 0. The number 0 (zero) or 1 and indicates when payments are due.
* 0 = At the end of period
* 1 = At the beginning of the period
*
* @return float
*/
function wiaas_PMT($interest, $num_of_payments, $PV, $FV = 0.00, $Type = 0){
/*$interest = $interest / 12;
$xp=pow((1+$interest),$num_of_payments);
return
($PV* $interest*$xp/($xp-1)+$interest/($xp-1)*$FV)*
($Type==0 ? 1 : 1/($interest+1));*/
$rates = [
24 => 4.282,
30 => 3.451,
36 => 2.896,
42 => 2.500,
48 => 2.223,
54 => 2.025,
60 => 1.834
];
$interest = isset($rates[$num_of_payments]) ? $rates[$num_of_payments] : 10;
return round($PV * ($interest / 100));
}
function wiaas_get_recurrent_price_mortage($principal_amount, $pay_period, $margin, $interest_rate) {
$new_principal_amount = $principal_amount - $margin;
$interest_rate = $interest_rate / 100;
$fixed_mortage = wiaas_PMT($interest_rate, $pay_period, $new_principal_amount);
return round($fixed_mortage, 2);
}
function wiaas_get_price_margin($fixed_price, $principal_amount, $total_cost) {
$total_gain = $fixed_price + $principal_amount;
return $total_gain - $total_cost;
}

107
backend/app/plugins/wiaas/includes/product/class-wiaas-product-category.php Normal file
View File

@@ -0,0 +1,107 @@
<?php
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
}
/**
* Registers available wiaas product categories
*
* Class Wiaas_Product_Category
*/
class Wiaas_Product_Category {
/**
* Available wiaas product categories
* @var array
*/
private static $available_product_categories = array(
'hardware' => array(
'name' => 'Hardware',
'type' => 'product',
),
'software' => array(
'name' => 'Software',
'type' => 'product',
),
'service' => array(
'name' => 'Service',
'type' => 'service',
),
'installation' => array(
'name' => 'Installation',
'type' => 'installation',
),
);
public static function init() {
add_action('woocommerce_after_register_taxonomy', array(__CLASS__, 'register_product_categories'));
}
/**
* Registers available wiaas product categories
*/
public static function register_product_categories() {
foreach (self::$available_product_categories as $key => $available_product_category) {
wp_insert_term($key, 'product_cat');
}
}
/**
* Retrieves category for provided product
* @param $product
*
* @return string|null
*/
public static function get_category($product) {
$product_categories = get_the_terms($product->get_id(), 'product_cat');
return is_array($product_categories) && isset($product_categories[0]) ?
$product_categories[0]->name :
null;
}
/**
* Determines if provided product is installation
* @param $product
*
* @return bool
*/
public static function is_installation($product) {
return self::_get_product_category_type($product) === 'installation';
}
/**
* Determines if provided product is service
* @param $product
*
* @return bool
*/
public static function is_service($product) {
return self::_get_product_category_type($product) === 'service';
}
// PRIVATE
/**
* Retrives product type based on its category for provided product
* @param $product
*
* @return null
*/
private static function _get_product_category_type($product) {
$product_categories = get_the_terms($product->get_id(), 'product_cat');
return is_array($product_categories) &&
isset($product_categories[0]) &&
isset(self::$available_product_categories[$product_categories[0]->name]) ?
self::$available_product_categories[$product_categories[0]->name]['type'] : null;
}
}
Wiaas_Product_Category::init();

10
backend/app/plugins/wiaas/wiaas.php
View File

@@ -26,10 +26,20 @@ include_once WIAAS_DIR . '/includes/class-wiaas-delivery-process.php';
include_once WIAAS_DIR . '/includes/class-wiaas-order.php'; include_once WIAAS_DIR . '/includes/class-wiaas-order.php';
include_once WIAAS_DIR . '/includes/class-wiaas-product.php';
include_once WIAAS_DIR . '/includes/class-wiaas-package.php'; include_once WIAAS_DIR . '/includes/class-wiaas-package.php';
include_once WIAAS_DIR . '/includes/class-wiaas-user.php'; include_once WIAAS_DIR . '/includes/class-wiaas-user.php';
include_once WIAAS_DIR . '/includes/class-wiaas-pricing.php';
include_once WIAAS_DIR . '/includes/class-wiaas-countries.php';
include_once WIAAS_DIR . '/includes/class-wiaas-documents.php';
include_once WIAAS_DIR . '/includes/class-wiaas-cart.php';
include_once WIAAS_DIR . '/includes/class-wiaas-api.php'; include_once WIAAS_DIR . '/includes/class-wiaas-api.php';
include_once WIAAS_DIR . '/includes/class-wiaas-admin.php'; include_once WIAAS_DIR . '/includes/class-wiaas-admin.php';

2
backend/composer.json
View File

@@ -61,6 +61,7 @@
"wpackagist-plugin/jwt-authentication-for-wp-rest-api": "1.2.4", "wpackagist-plugin/jwt-authentication-for-wp-rest-api": "1.2.4",
"wpackagist-plugin/capability-manager-enhanced": "1.5.9", "wpackagist-plugin/capability-manager-enhanced": "1.5.9",
"wpackagist-plugin/wp-user-groups": "2.2.0", "wpackagist-plugin/wp-user-groups": "2.2.0",
"wpackagist-plugin/radio-buttons-for-taxonomies": "1.8.3",
"3rdparty/gravityforms": "*", "3rdparty/gravityforms": "*",
"3rdparty/gravityflow": "*", "3rdparty/gravityflow": "*",
@@ -94,6 +95,7 @@
"wp plugin activate capability-manager-enhanced", "wp plugin activate capability-manager-enhanced",
"wp plugin activate groups", "wp plugin activate groups",
"wp plugin activate wp-user-groups", "wp plugin activate wp-user-groups",
"wp plugin activate radio-buttons-for-taxonomies",
"wp plugin activate wiaas" "wp plugin activate wiaas"
], ],
"update-db": [ "update-db": [

24
backend/composer.lock generated
View File

@@ -1,10 +1,10 @@
{ {
"_readme": [ "_readme": [
"This file locks the dependencies of your project to a known state", "This file locks the dependencies of your project to a known state",
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "302f569929ecdaf4d349b0bf764de74c", "content-hash": "d979d3435513dd818189e2f68cc023fe",
"packages": [ "packages": [
{ {
"name": "3rdparty/gravityflow", "name": "3rdparty/gravityflow",
@@ -568,6 +568,26 @@
"type": "wordpress-plugin", "type": "wordpress-plugin",
"homepage": "https://wordpress.org/plugins/mailchimp-for-woocommerce/" "homepage": "https://wordpress.org/plugins/mailchimp-for-woocommerce/"
}, },
{
"name": "wpackagist-plugin/radio-buttons-for-taxonomies",
"version": "1.8.3",
"source": {
"type": "svn",
"url": "https://plugins.svn.wordpress.org/radio-buttons-for-taxonomies/",
"reference": "tags/1.8.3"
},
"dist": {
"type": "zip",
"url": "https://downloads.wordpress.org/plugin/radio-buttons-for-taxonomies.1.8.3.zip",
"reference": null,
"shasum": null
},
"require": {
"composer/installers": "~1.0"
},
"type": "wordpress-plugin",
"homepage": "https://wordpress.org/plugins/radio-buttons-for-taxonomies/"
},
{ {
"name": "wpackagist-plugin/woocommerce-gateway-paypal-express-checkout", "name": "wpackagist-plugin/woocommerce-gateway-paypal-express-checkout",
"version": "1.5.6", "version": "1.5.6",

5
frontend/package-lock.json generated
View File

@@ -4336,11 +4336,6 @@
"resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
"integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=" "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8="
}, },
"lodash.cond": {
"version": "4.5.2",
"resolved": "https://registry.npmjs.org/lodash.cond/-/lodash.cond-4.5.2.tgz",
"integrity": "sha1-9HGh2khr5g9quVXRcRVSPdHSVdU="
},
"lodash.defaults": { "lodash.defaults": {
"version": "4.2.0", "version": "4.2.0",
"resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz", "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz",

1
frontend/package.json
View File

@@ -6,6 +6,7 @@
"@tinymce/tinymce-react": "^2.0.3", "@tinymce/tinymce-react": "^2.0.3",
"axios": "^0.17.0", "axios": "^0.17.0",
"bootstrap": "^4.0.0-beta.2", "bootstrap": "^4.0.0-beta.2",
"classnames": "^2.2.5",
"flag-icon-css": "^2.8.0", "flag-icon-css": "^2.8.0",
"font-awesome": "^4.7.0", "font-awesome": "^4.7.0",
"glamor": "^2.20.40", "glamor": "^2.20.40",

34
frontend/src/actions/coMarket/coMarketPackageDetailsActions.js
View File

@@ -55,7 +55,7 @@ export const fetchPackageDetails = (params) => {
if(packageData.groups){ if(packageData.groups){
Object.keys(packageData.groups).forEach((idGroup) => { Object.keys(packageData.groups).forEach((idGroup) => {
const defaultOption = packageData.groups[idGroup].options.find((option) => {return parseInt(option.isDefault, 10) === 1}); const defaultOption = packageData.groups[idGroup].options.find((option) => option.isDefault);
if(defaultOption){ if(defaultOption){
dispatch(selectOption(idGroup, defaultOption)); dispatch(selectOption(idGroup, defaultOption));
} }
@@ -71,16 +71,18 @@ export const fetchPackageDetails = (params) => {
} }
} }
const generateOptions = (selectedOptions, selectedAdditionals, selectedAgreement) => { const collectPackageOptionsAndAdditionals = (selectedOptions, selectedAdditionals, selectedAgreement) => {
const extraPackages = []; const optionPackages = [];
const additionalPackages = [];
const unavailablePackages = []; const unavailablePackages = [];
if(selectedAdditionals && selectedAdditionals.length){ if(selectedAdditionals && selectedAdditionals.length){
selectedAdditionals.forEach(additional => { selectedAdditionals.forEach(additional => {
const selectedPrice = priceHelper.getSelectedPrice(additional, selectedAgreement); const selectedPrice = priceHelper.getSelectedPrice(additional, selectedAgreement);
if(!selectedPrice){ if(!selectedPrice){
unavailablePackages.push(additional); unavailablePackages.push(additional);
}else{ }else{
extraPackages.push(additional.idAdditionalPackage); additionalPackages.push(additional.idAdditionalPackage);
} }
}); });
} }
@@ -91,12 +93,12 @@ const generateOptions = (selectedOptions, selectedAdditionals, selectedAgreement
if(!selectedPrice){ if(!selectedPrice){
unavailablePackages.push(selectedOptions[idGroup]); unavailablePackages.push(selectedOptions[idGroup]);
}else{ }else{
extraPackages.push(selectedOptions[idGroup].idOptionPackage); optionPackages.push(selectedOptions[idGroup].idOptionPackage);
} }
}); });
} }
return {extraPackages, unavailablePackages}; return {optionPackages, additionalPackages, unavailablePackages};
}; };
const requestAddToCart = () => ({ const requestAddToCart = () => ({
@@ -104,20 +106,24 @@ const requestAddToCart = () => ({
}); });
export const addToCart = (addParams) => { export const addToCart = (addParams) => {
// const options = generateOptions(addParams.selectedOptions, addParams.selectedAdditionals, addParams.selectedAgreement); const result = collectPackageOptionsAndAdditionals(
addParams.selectedOptions,
addParams.selectedAdditionals,
addParams.selectedAgreement);
const params = { const params = {
'package_id': addParams.selectedPackage.id, 'package_id': addParams.selectedPackage.id,
'price_id': addParams.selectedAgreement.idPrice, 'price_id': addParams.selectedAgreement.idPrice,
//options: options.extraPackages 'addons': result.additionalPackages,
'options': result.optionPackages
}; };
// if(options.unavailablePackages.length){ if(result.unavailablePackages.length){
// const unavailable = options.unavailablePackages.map((unavailable) =>{return unavailable.optionName || unavailable.packageName;}); const unavailable = result.unavailablePackages.map((unavailable) =>{return unavailable.optionName || unavailable.packageName;});
// const message = coMarketMessages.UNAVAILABLE_PACKAGES + ' ' + unavailable.join(); const message = coMarketMessages.UNAVAILABLE_PACKAGES + ' ' + unavailable.join();
//
// return dispatch => {dispatch(updateMessages([{code: 'warning', message}], coMarketMessages))}; return dispatch => {dispatch(updateMessages([{code: 'warning', message}], coMarketMessages))};
// } }
return dispatch => { return dispatch => {
dispatch(requestAddToCart()); dispatch(requestAddToCart());

2
frontend/src/constants/cartConstants.js
View File

@@ -143,7 +143,7 @@ export const cartTexts = {
REMOVE_ITEM_HEADER: 'Remove item confirmation', REMOVE_ITEM_HEADER: 'Remove item confirmation',
REMOVE_ITEM_TEXT: 'Are you sure you want to remove ', REMOVE_ITEM_TEXT: 'Are you sure you want to remove ',
REMOVE_FROM_CART: 'Remove from cart', REMOVE_FROM_CART: 'Remove from cart',
ADDITIOONAL_PACKAGE: 'Additional package', ADDITIOONAL_PACKAGE: 'Addons',
DOC_NOT_REQUIRED: 'Document not required', DOC_NOT_REQUIRED: 'Document not required',
FILE_UPLOADED_TEXT: 'File uploaded! Select or drop to replace ', FILE_UPLOADED_TEXT: 'File uploaded! Select or drop to replace ',
FILE: 'file', FILE: 'file',

2
frontend/src/constants/coMarketConstants.js
View File

@@ -84,7 +84,7 @@ export const coMarketTexts = {
ON_DELIVERY: 'On delivery', ON_DELIVERY: 'On delivery',
MONTHLY: 'Monthly', MONTHLY: 'Monthly',
NOT_AVAILABLE: 'Not available', NOT_AVAILABLE: 'Not available',
SELECTION_NOT_AVAILABLE: 'This selection is not available for the selected price type!', SELECTION_NOT_AVAILABLE: 'Not available for price type',
RECURRENT_PRICE: 'Package recurent price', RECURRENT_PRICE: 'Package recurent price',
SERVICE_PRICE: 'Services and support', SERVICE_PRICE: 'Services and support',
EXTEND: 'with possibility to extend each', EXTEND: 'with possibility to extend each',

47
frontend/src/containers/cart/CartItemsContainer.jsx
View File

@@ -32,36 +32,39 @@ class CartItemsContainer extends Component {
isFormDisabled={isCartItemsDisabled}/>)} isFormDisabled={isCartItemsDisabled}/>)}
<div id="total-price-in-cart-container" className="cart-show-items"> <div id="total-price-in-cart-container" className="cart-show-items">
<Row className="cart-total-price"> <Row id={"cart-total-price"} className="cart-total-price">
<Col lg="5" xs="5" className="item-name"> <Col lg="3" xs="3" className="item-name d-flex align-items-center">
<span>
{cartTexts.labels.TOTAL_PRICE}: {cartTexts.labels.TOTAL_PRICE}:
</span>
</Col> </Col>
{ {
orderTotalPrice && orderTotalPrice &&
<Col id={"cart-total-price"} <Col className="d-flex">
lg="7" xs="7" <div className="d-flex flex-column flex-grow-1">
className="item-name"> <div className="d-flex flex-grow-1 no-wrap cart-total-price-header">
<table className="price-table"> <Col>
<thead> <span>{cartTexts.labels.ON_DELIVERY}:</span>
<tr> </Col>
<th>{cartTexts.labels.ON_DELIVERY}</th> <Col>
<th>{cartTexts.labels.MONTHLY}</th> <span>{cartTexts.labels.MONTHLY}:</span>
</tr> </Col>
</thead> </div>
<tbody> <div className="d-flex flex-grow-1 no-wrap item-price-value">
<tr> <Col>
<td> <h5>
{orderTotalPrice.fixedPrice.toLocaleString()} {orderTotalPrice.currency} {' '} {orderTotalPrice.fixedPrice.toLocaleString()} {orderTotalPrice.currency} {' '}
</td> </h5>
<td> </Col>
<Col>
<h5>
{ {
orderTotalPrice.recurrentPrice && orderTotalPrice.recurrentPrice.toLocaleString() + ' ' + orderTotalPrice.currency orderTotalPrice.recurrentPrice && orderTotalPrice.recurrentPrice.toLocaleString() + ' ' + orderTotalPrice.currency
} }
</td> </h5>
</tr> </Col>
</tbody> </div>
</table> </div>
</Col> </Col>
} }
</Row> </Row>

4
frontend/src/containers/cart/CartReviewOrderContainer.jsx
View File

@@ -93,7 +93,7 @@ class CartReviewOrderContainer extends Component {
<Col md="4" id="review-tender">{customerDetails.details.idProject ? this.getProjectName(customerDetails.details.idProject) : '-'}</Col> <Col md="4" id="review-tender">{customerDetails.details.idProject ? this.getProjectName(customerDetails.details.idProject) : '-'}</Col>
</Row> </Row>
<div> <div>
<h4>{cartTexts.labels.DELIVERY_ADDRESS}</h4> <h6>{cartTexts.labels.DELIVERY_ADDRESS}</h6>
<Row className="cart-customer-main-info-row"> <Row className="cart-customer-main-info-row">
<Col md="4">{cartTexts.labels.ADDRESS}</Col> <Col md="4">{cartTexts.labels.ADDRESS}</Col>
<Col md="4"id="review-delivery-address">{customerDetails.delivery.detailedAddress}</Col> <Col md="4"id="review-delivery-address">{customerDetails.delivery.detailedAddress}</Col>
@@ -113,7 +113,7 @@ class CartReviewOrderContainer extends Component {
</div> </div>
<div> <div>
<h4>{cartTexts.labels.BILLING_ADDRESS}</h4> <h6>{cartTexts.labels.BILLING_ADDRESS}</h6>
<Row className="cart-customer-main-info-row"> <Row className="cart-customer-main-info-row">
<Col md="4">{cartTexts.labels.COMPANY}</Col> <Col md="4">{cartTexts.labels.COMPANY}</Col>
<Col md="4" id="review-billing-company">{customerDetails.companyName}</Col> <Col md="4" id="review-billing-company">{customerDetails.companyName}</Col>

83
frontend/src/containers/cart/components/CartItem.jsx
View File

@@ -7,6 +7,7 @@ import {updateQuantity, removeCartItem} from '../../../actions/cart/cartActions'
import {setDialogContent, setDialogOpenFlag} from '../../../actions/dialog/dialogActions'; import {setDialogContent, setDialogOpenFlag} from '../../../actions/dialog/dialogActions';
import {cartMessages, cartTexts} from '../../../constants/cartConstants'; import {cartMessages, cartTexts} from '../../../constants/cartConstants';
import PackageBids from './PackageBids.jsx'; import PackageBids from './PackageBids.jsx';
import {coMarketTexts} from "../../../constants/coMarketConstants";
class CartItem extends Component { class CartItem extends Component {
constructor(props) { constructor(props) {
@@ -88,17 +89,17 @@ class CartItem extends Component {
totalRecurrent += selectedBid.servicesPrice + selectedBid.recurrentPrice; totalRecurrent += selectedBid.servicesPrice + selectedBid.recurrentPrice;
oldTotal = cartItem.fixedPrice; oldTotal = cartItem.fixedPrice;
oldTotalRecurrent = cartItem.servicesPrice + cartItem.recurentPrice; oldTotalRecurrent = cartItem.servicesPrice + cartItem.recurrentPrice;
}else{ }else{
total += cartItem.fixedPrice; total += cartItem.fixedPrice;
totalRecurrent += cartItem.servicesPrice + cartItem.recurentPrice; totalRecurrent += cartItem.servicesPrice + cartItem.recurrentPrice;
} }
if(cartItem.options.length) { if(cartItem.options.length) {
cartItem.options.forEach((packageOption) => { cartItem.options.forEach((packageOption) => {
if(Object.keys(packageOption.prices).length) { if(Object.keys(packageOption.prices).length) {
total += parseFloat(packageOption.prices.fixedExtra); total += parseFloat(packageOption.prices.fixedExtra);
totalRecurrent += parseFloat(packageOption.prices.recurentExtra) + parseFloat(packageOption.prices.servicesExtra); totalRecurrent += parseFloat(packageOption.prices.recurrentExtra) + parseFloat(packageOption.prices.servicesExtra);
} }
}); });
} }
@@ -106,7 +107,7 @@ class CartItem extends Component {
cartItem.additionalPackages.forEach((additionalPackage) => { cartItem.additionalPackages.forEach((additionalPackage) => {
if(Object.keys(additionalPackage).length) { if(Object.keys(additionalPackage).length) {
total += parseFloat(additionalPackage.prices.fixedExtra); total += parseFloat(additionalPackage.prices.fixedExtra);
totalRecurrent += parseFloat(additionalPackage.prices.recurentExtra) + parseFloat(additionalPackage.prices.servicesExtra); totalRecurrent += parseFloat(additionalPackage.prices.recurrentExtra) + parseFloat(additionalPackage.prices.servicesExtra);
} }
}); });
} }
@@ -201,43 +202,52 @@ class CartItem extends Component {
} }
{cartItem.options.length > 0 && {cartItem.options.length > 0 &&
cartItem.options.map((packageOption) => cartItem.options.map((packageOption) =>
<Row className="cart-item-small-details" key={"package-option-" + cartItem.key + "-" + packageOption.idOptionPackage}> <Row
<Col lg={{offset: 1, size: 4}} xs={{offset: 1, size: 4}}> className="cart-item-small-details flex-column"
key={"package-option-" + cartItem.key + "-" + packageOption.idOptionPackage}
>
<span className="cart-item-additional-title">
{packageOption.groupName}: {packageOption.groupName}:
</Col> </span>
<Col lg="7" xs="7" id={"item-option-" + cartItem.key + "-" + packageOption.idOptionPackage}> <span id={"item-option-" + cartItem.key + "-" + packageOption.idOptionPackage}>
{packageOption.packageName} {packageOption.packageName}
</Col> </span>
</Row> </Row>
) )
} }
{cartItem.additionalPackages.length > 0 && {
cartItem.additionalPackages.map((additionalPackage) => cartItem.additionalPackages.length > 0 && <Row className="cart-item-small-details flex-column">
<Row className="cart-item-small-details" key={"additional-package-" + cartItem.key + "-" + additionalPackage.idAdditionalPackage}> <span className="cart-item-additional-title">
<Col lg={{offset: 1, size: 4}} xs={{offset:1, size: 4}}>
{cartTexts.labels.ADDITIOONAL_PACKAGE}: {cartTexts.labels.ADDITIOONAL_PACKAGE}:
</Col> </span>
<Col lg="7" xs="7" id={"item-additional-" + cartItem.key + "-" + additionalPackage.idAdditionalPackage}> {
cartItem.additionalPackages.map((additionalPackage) =>
<span
key={"item-additional-" + cartItem.key + "-" + additionalPackage.idAdditionalPackage}
id={"item-additional-" + cartItem.key + "-" + additionalPackage.idAdditionalPackage}
>
{additionalPackage.packageName} {additionalPackage.packageName}
</Col> </span>
</Row>
) )
} }
<Row className="cart-item-small-details justify-content-between item-price"> </Row>
<Col className="d-flex align-items-center"> }
<span className="item-payment-type">{cartItem.payType}:</span> <Row className="cart-item-small-details item-price">
<Col className="d-flex align-items-center col-3 item-price-type">
<span className="item-price-type">{cartItem.payType}:</span>
</Col> </Col>
<Col className="d-flex col-auto"> <Col className="d-flex">
<table className="price-table"> <div className="d-flex flex-column flex-grow-1">
<thead> <div className="d-flex flex-grow-1 no-wrap item-price-header">
<tr> <Col>
<th>{cartTexts.labels.ON_DELIVERY}</th> <span>{cartTexts.labels.ON_DELIVERY}:</span>
<th>{cartTexts.labels.MONTHLY}</th> </Col>
</tr> <Col>
</thead> <span>{cartTexts.labels.MONTHLY}:</span>
<tbody> </Col>
<tr> </div>
<td> <div className="d-flex flex-grow-1 no-wrap item-price-value">
<Col>
{ {
this.state.fixedPrice && this.state.fixedPrice &&
<div> <div>
@@ -251,8 +261,8 @@ class CartItem extends Component {
</div> </div>
} }
</td> </Col>
<td> <Col>
{ {
this.state.recurrentPrice && this.state.recurrentPrice &&
<div> <div>
@@ -265,10 +275,9 @@ class CartItem extends Component {
</div> </div>
</div> </div>
} }
</td> </Col>
</tr> </div>
</tbody> </div>
</table>
</Col> </Col>
</Row> </Row>
</Col> </Col>

43
frontend/src/containers/cart/style/Cart.scss
View File

@@ -2,7 +2,7 @@
#cart-count { #cart-count {
vertical-align: middle; vertical-align: middle;
color: $cart-count-color; color: $accentColor;
font-size: 1.5rem; font-size: 1.5rem;
border-radius: 1rem; border-radius: 1rem;
font-family: arial,sans-serif; font-family: arial,sans-serif;
@@ -46,6 +46,11 @@
font-weight: $font-weight; font-weight: $font-weight;
} }
.cart-item-additional-title {
font-weight: 600;
color: $font-light-color;
}
.cart-item-details { .cart-item-details {
.item-name { .item-name {
} }
@@ -65,14 +70,34 @@
} }
.item-price { .item-price {
background-color: $hoverColor; background-color: #fbfbfb;
margin-top: 1rem; margin-top: 1rem;
border-radius: $box-radius;
.item-price-type {
padding: 0.4rem;
color: $font-light-color;
font-weight: 600;
}
.item-price-header {
font-weight: 600;
color: $font-light-color;
padding: 0.4rem;
}
.item-price-value {
padding: 0.4rem;
}
} }
.cart-total-price { .cart-total-price {
padding: 1rem 0; padding: 1rem 0;
font-size: $font-size-big; font-size: $font-size-big;
.cart-total-price-header {
color: $font-light-color;
font-weight: 600;
}
} }
.price-table th{ .price-table th{
@@ -105,17 +130,27 @@
#cart-review-order-container { #cart-review-order-container {
border-radius: $box-radius; border-radius: $box-radius;
.cart-customer-main-info-row { .cart-customer-main-info-row {
padding: 0.5rem; padding: 0.5rem;
text-align: left; text-align: left;
> div:first-child {
color: $font-light-color;
font-weight: 600;
}
} }
.place-order-btn { .place-order-btn {
cursor: pointer; cursor: pointer;
background-color: $done-status-color; background-color: $accentColor;
border: none;
width: 100%; width: 100%;
float: right; float: right;
font-weight: $font-weight; font-weight: $font-weight;
&:focus, &:hover {
box-shadow: 0 0 0 0.1rem lighten($accentColor, 0.9) !important;
}
} }
.button-cart { .button-cart {

31
frontend/src/containers/coMarket/CoMarketPackageDetailsContainer.jsx
View File

@@ -5,7 +5,7 @@ import WiaasBox from '../../mainComponents/box/WiaasBox.jsx';
import {fetchPackageDetails, addToCart} from '../../actions/coMarket/coMarketPackageDetailsActions'; import {fetchPackageDetails, addToCart} from '../../actions/coMarket/coMarketPackageDetailsActions';
import PackageInfo from './components/PackageInfo.jsx'; import PackageInfo from './components/PackageInfo.jsx';
import PackagePrice from './components/PackagePrice.jsx'; import PackagePrice from './components/PackagePrice.jsx';
import PackageOptions from './components/PackageOptions.jsx'; import PackageOptionGroup from './components/PackageOptionGroup';
import AdditionalPackages from './components/AdditionalPackages.jsx'; import AdditionalPackages from './components/AdditionalPackages.jsx';
import AgreementOptions from './components/AgreementOptions.jsx'; import AgreementOptions from './components/AgreementOptions.jsx';
import {coMarketTexts} from '../../constants/coMarketConstants'; import {coMarketTexts} from '../../constants/coMarketConstants';
@@ -64,21 +64,30 @@ class CoMarketPackageDetailsContainer extends Component {
<Col xl="6" lg="7" md="12" xs="12"> <Col xl="6" lg="7" md="12" xs="12">
<div id="shop-package-buy-info"> <div id="shop-package-buy-info">
{ <PackagePrice currency={selectedPackage.currency} />
selectedPackage.groups && Object.keys(selectedPackage.groups).length > 0 && selectedAgreement && <AgreementOptions
<PackageOptions prices={selectedPackage.prices}
groups={selectedPackage.groups} currency={selectedPackage.currency}/>
country={selectedPackage.country}/>
}
{ {
selectedPackage.additionalPackages && selectedPackage.additionalPackages.length > 0 && selectedAgreement && selectedPackage.additionalPackages && selectedPackage.additionalPackages.length > 0 && selectedAgreement &&
<AdditionalPackages <AdditionalPackages
additionalPackages={selectedPackage.additionalPackages} additionalPackages={selectedPackage.additionalPackages}
country={selectedPackage.country}/>
}
<AgreementOptions
prices={selectedPackage.prices}
currency={selectedPackage.currency}/> currency={selectedPackage.currency}/>
}
{
selectedPackage.groups && Object.keys(selectedPackage.groups).length > 0 && selectedAgreement &&
(<div className="shop-package-options">
{
Object.keys(selectedPackage.groups).map(groupKey => {
const group = selectedPackage.groups[groupKey];
return (<PackageOptionGroup
key={groupKey}
group={group}
currency={selectedPackage.currency}/>);
})
}
</div>)
}
<Row className="justify-content-end" style={{ marginTop: 30 }}> <Row className="justify-content-end" style={{ marginTop: 30 }}>
<Button id="add-to-cart-btn" <Button id="add-to-cart-btn"
className="add-to-cart-btn" className="add-to-cart-btn"

124
frontend/src/containers/coMarket/components/AdditionalPackageItemContainer.jsx
View File

@@ -1,6 +1,7 @@
import React, {Component} from 'react'; import React, {Component} from 'react';
import {connect} from 'react-redux'; import {connect} from 'react-redux';
import {Label, Popover, PopoverBody, Input, Col} from 'reactstrap'; import classnames from 'classnames';
import {Label, Input, Col} from 'reactstrap';
import {selectAdditional, removetAdditional} from '../../../actions/coMarket/coMarketPackageDetailsActions'; import {selectAdditional, removetAdditional} from '../../../actions/coMarket/coMarketPackageDetailsActions';
import PriceHelper from '../../../helpers/coMarket/PriceHelper'; import PriceHelper from '../../../helpers/coMarket/PriceHelper';
import {coMarketTexts} from '../../../constants/coMarketConstants'; import {coMarketTexts} from '../../../constants/coMarketConstants';
@@ -11,18 +12,9 @@ class AdditionalPackageItem extends Component {
constructor(props) { constructor(props) {
super(props); super(props);
this.toggle = this.toggle.bind(this);
this.handleOptionChange = this.handleOptionChange.bind(this); this.handleOptionChange = this.handleOptionChange.bind(this);
this.isChecked = this.isChecked.bind(this); this.isChecked = this.isChecked.bind(this);
this.state = { this.state = {};
popoverOpen: false
};
}
toggle() {
this.setState({
popoverOpen: !this.state.popoverOpen
});
} }
handleOptionChange() { handleOptionChange() {
@@ -34,7 +26,7 @@ class AdditionalPackageItem extends Component {
} }
isChecked() { isChecked() {
return this.props.selectedAdditionals return !!this.props.selectedAdditionals
&& this.props.selectedAdditionals.includes(this.props.additionalPackage); && this.props.selectedAdditionals.includes(this.props.additionalPackage);
} }
@@ -44,9 +36,9 @@ class AdditionalPackageItem extends Component {
}); });
} }
getClass(isChecked) { getClass() {
return isChecked ? return this.isChecked() ?
'selected-option' : 'shop-package-option-selected' :
''; '';
} }
@@ -55,71 +47,71 @@ class AdditionalPackageItem extends Component {
} }
render() { render() {
const {additionalPackage, country} = this.props; const {additionalPackage, currency} = this.props;
const isAvailable = this.isAvailable(); const isAvailable = this.isAvailable();
const selectedPrice = priceHelper.getSelectedPrice(additionalPackage, this.props.selectedAgreement); const selectedPrice = priceHelper.getSelectedPrice(additionalPackage, this.props.selectedAgreement);
const isChecked = this.isChecked(); const isChecked = this.isChecked();
const classes = classnames('shop-package-option d-flex',
{
'shop-package-option-selected': isChecked,
'shop-package-option-disabled': !isAvailable,
});
return ( return (
<Col xl="4" lg="4" md="6" xs="6" className="option-value"> <div
<div className={'option-selection ' + this.getClass(isChecked)}> id={'info-additonal-' + additionalPackage.idAdditionalPackage}
<Label check> className={classes}
>
<Label check className="d-flex flex-grow-1 flex-column">
<div className="d-flex">
<Col className="col-6 d-flex align-items-center">
<Input type="checkbox" <Input type="checkbox"
checked={isChecked}
onChange={this.handleOptionChange} onChange={this.handleOptionChange}
name={'package-option-'+ additionalPackage.idAdditionalPackage} name={'package-option-'+ additionalPackage.idAdditionalPackage}
className="package-option-input"/> className="package-option-input"
<div className="option-name">{this.formatName(additionalPackage.packageName)}</div> disabled={!isAvailable}
<div className="option-description" dangerouslySetInnerHTML={{__html: additionalPackage.shortDescription}}></div> />
{ <span className="option-name">
priceHelper.hasFixedPrice(selectedPrice) && {this.formatName(additionalPackage.packageName)}
<div className="option-prices"> </span>
<table className="price-table option-price-table">
<thead>
<tr>
<th>{coMarketTexts.labels.ON_DELIVERY}</th>
<th>{coMarketTexts.labels.MONTHLY}</th>
</tr>
</thead>
<tbody>
<tr>
<td>{selectedPrice.fixedExtra > 0 ? selectedPrice.fixedExtra.toLocaleString() : 0} {country.currency}</td>
<td>
<div className="option-value-text monthly-price">
{
priceHelper.hasRecurrentPrice(selectedPrice)
? priceHelper.sumPrices([selectedPrice.recurentExtra, selectedPrice.servicesExtra]).toLocaleString() + ' '
: 0
} {country.currency}
</div>
</td>
</tr>
</tbody>
</table>
</div>
}
</Label>
{ {
!isAvailable && !isAvailable &&
<span className="not-available"> <span className="not-available">
({coMarketTexts.labels.NOT_AVAILABLE}) ({coMarketTexts.labels.SELECTION_NOT_AVAILABLE})
<i className="price-info-btn fa fa-info-circle"
aria-hidden="true"
id={'info-additonal-' + additionalPackage.idAdditionalPackage}
onClick={this.toggle}></i>
</span> </span>
} }
</div>
<Popover placement="bottom"
isOpen={this.state.popoverOpen}
target={'info-additonal-' + additionalPackage.idAdditionalPackage}
toggle={this.toggle}>
<PopoverBody>
{coMarketTexts.labels.SELECTION_NOT_AVAILABLE}
</PopoverBody>
</Popover>
</Col> </Col>
<Col className="col-3 d-flex align-items-center">
<span>
{
isAvailable ?
(selectedPrice.fixedExtra ?
`${selectedPrice.fixedExtra} ${currency}` :
'0') :
'-'
}
</span>
</Col>
<Col className="col-3 d-flex align-items-center">
<span>
{
isAvailable ?
(priceHelper.hasRecurrentPrice(selectedPrice) ?
`${priceHelper.sumPrices([selectedPrice.recurrentExtra, selectedPrice.servicesExtra])} ${currency}` :
'0') :
'-'
}
</span>
</Col>
</div>
<div
className="shop-package-option-description"
dangerouslySetInnerHTML={{__html: additionalPackage.shortDescription}}
></div>
</Label>
</div>
); );
} }
} }

10
frontend/src/containers/coMarket/components/AdditionalPackages.jsx
View File

@@ -5,19 +5,19 @@ import {coMarketTexts} from '../../../constants/coMarketConstants';
class AdditionalPackages extends Component { class AdditionalPackages extends Component {
render() { render() {
const {additionalPackages, country} = this.props; const {additionalPackages, currency} = this.props;
return ( return (
<div className="shop-package-options"> <div className="shop-package-options">
<h6 className="shop-package-label options-header">{coMarketTexts.labels.ADDITIONAL_PACKAGES}:</h6> <h6 className="shop-package-option-header">
<Row> {coMarketTexts.labels.ADDITIONAL_PACKAGES}:
</h6>
{ {
additionalPackages.map(additionalPackage => { additionalPackages.map(additionalPackage => {
return <AdditionalPackageItemContainer key={'additonal-' + additionalPackage.idAdditionalPackage} return <AdditionalPackageItemContainer key={'additonal-' + additionalPackage.idAdditionalPackage}
country={country} currency={currency}
additionalPackage={additionalPackage}/> additionalPackage={additionalPackage}/>
}) })
} }
</Row>
</div> </div>
); );
} }

69
frontend/src/containers/coMarket/components/AgreementOptionItemContainer.jsx
View File

@@ -1,6 +1,6 @@
import React, {Component} from 'react'; import React, {Component} from 'react';
import {connect} from 'react-redux'; import {connect} from 'react-redux';
import {Label, Popover, PopoverBody, Input, Col, Row} from 'reactstrap'; import {Label, Input, Col} from 'reactstrap';
import {selectAgreement} from '../../../actions/coMarket/coMarketPackageDetailsActions'; import {selectAgreement} from '../../../actions/coMarket/coMarketPackageDetailsActions';
import PriceHelper from '../../../helpers/coMarket/PriceHelper'; import PriceHelper from '../../../helpers/coMarket/PriceHelper';
import {coMarketTexts} from '../../../constants/coMarketConstants'; import {coMarketTexts} from '../../../constants/coMarketConstants';
@@ -30,7 +30,7 @@ class AgreementOptionItem extends Component {
getClass(selectedAgreement, price) { getClass(selectedAgreement, price) {
return selectedAgreement.idPaymentType === price.idPaymentType ? return selectedAgreement.idPaymentType === price.idPaymentType ?
'selected-option' : 'shop-package-option-selected' :
''; '';
} }
@@ -38,11 +38,10 @@ class AgreementOptionItem extends Component {
const {price, selectedAgreement, currency} = this.props; const {price, selectedAgreement, currency} = this.props;
return ( return (
<Row <div className={`shop-package-option d-flex ${this.getClass(selectedAgreement, price)}`}>
className={`option-selection ${this.getClass(selectedAgreement, price)}`} <Label check className="d-flex flex-grow-1 flex-column">
> <div className="d-flex">
<Label check className="row flex-grow-1 no-wrap"> <Col className="d-flex align-items-center col-6">
<Col className="d-flex align-items-center">
<Input type="radio" <Input type="radio"
name="price-type" name="price-type"
onChange={this.handleOptionChange} onChange={this.handleOptionChange}
@@ -51,61 +50,49 @@ class AgreementOptionItem extends Component {
className="price-type-option"/> className="price-type-option"/>
<span className="option-name">{price.payType}</span> <span className="option-name">{price.payType}</span>
</Col> </Col>
<Col className="d-flex align-items-center"> <Col className="d-flex align-items-center col-3">
<span>{price.fixedExtra.toLocaleString()} {currency}</span> <span>{price.fixedExtra.toLocaleString()} {currency}</span>
</Col> </Col>
<Col className="d-flex align-items-center"> <Col className="d-flex align-items-center col-3">
<span className="option-value-text monthly-price"> <span className="option-value-text monthly-price">
{ {
priceHelper.hasRecurrentPrice(price) priceHelper.hasRecurrentPrice(price)
? `${priceHelper.sumPrices([price.recurentExtra, price.servicesExtra]).toLocaleString()} ${currency}` ? `${priceHelper.sumPrices([price.recurrentExtra, price.servicesExtra]).toLocaleString()} ${currency}`
: '0' : '0'
} }
</span> </span>
</Col> </Col>
</Label>
<i className="price-info-btn fa fa-info-circle d-flex align-items-center"
aria-hidden="true"
id={'info-additonal-' + price.idPaymentType}
onClick={this.toggle}></i>
<Popover placement="bottom"
isOpen={this.state.popoverOpen}
target={'info-additonal-' + price.idPaymentType}
className="price-info-popover"
container="shop-package-buy-info"
toggle={this.toggle}>
<PopoverBody>
<div>
{
price.recurentExtra > 0 &&
<div className="package-price-recurrent">
<span className="price-info-title">{coMarketTexts.labels.RECURRENT_PRICE}: </span>
{(price.recurentExtra).toLocaleString()} {currency} / {price.periodUnit}
{
price.packagePayPeriod > 0 &&
<span>
{' '} for {price.packagePayPeriod} {price.periodUnit}
</span>
}
</div> </div>
<div className="shop-package-option-description">
{
price.recurrentExtra > 0 &&
<span>
{
`${coMarketTexts.labels.RECURRENT_PRICE}: ${price.recurrentExtra} ${currency} / ${price.periodUnit}} ${price.packagePayPeriod > 0 ? ` for ${price.packagePayPeriod} ${price.periodUnit}` : ''}`
}
</span>
} }
{ {
price.servicesExtra > 0 && price.servicesExtra > 0 &&
<div className="services-price-recurrent"> <div className="d-flex flex-column">
<span className="price-info-title">{coMarketTexts.labels.SERVICE_PRICE}: </span> <span>
{(price.servicesExtra).toLocaleString()} {currency} / {price.periodUnit} {
`${coMarketTexts.labels.SERVICE_PRICE}: ${(price.servicesExtra)} ${currency} / ${price.periodUnit} ${price.servicesContractPeriod > 0 ? `for ${price.servicesContractPeriod} ${price.periodUnit}` : ''}`
}
</span>
{ {
price.servicesContractPeriod > 0 && price.servicesContractPeriod > 0 &&
<span> <span>
{' '} for {price.servicesContractPeriod} {price.periodUnit} {coMarketTexts.labels.EXTEND} {price.periodUnit} (Max {price.maxContractPeriod} {price.periodUnit}) {
`${coMarketTexts.labels.EXTEND} ${price.periodUnit} (Max ${price.maxContractPeriod} ${price.periodUnit})`
}
</span> </span>
} }
</div> </div>
} }
</div> </div>
</PopoverBody> </Label>
</Popover> </div>
</Row>
); );
} }
} }

73
frontend/src/containers/coMarket/components/AgreementOptions.jsx
View File

@@ -1,86 +1,19 @@
import React, {Component} from 'react'; import React, {Component} from 'react';
import {Row, Col} from 'reactstrap';
import AgreementOptionItemContainer from './AgreementOptionItemContainer.jsx'; import AgreementOptionItemContainer from './AgreementOptionItemContainer.jsx';
import {coMarketTexts} from '../../../constants/coMarketConstants';
import {connect} from "react-redux";
class AgreementOptions extends Component { class AgreementOptions extends Component {
constructor(props) {
super(props);
this.getFinalPrice = this.getFinalPrice.bind(this);
this.filterByAgreement = this.filterByAgreement.bind(this);
}
filterByAgreement(price) {
return price.idPaymentType === this.props.selectedAgreement.idPaymentType;
}
getExtra(selected, priceType) {
const extraPriceObj = selected.prices.find(this.filterByAgreement);
const extraPrice = extraPriceObj ? extraPriceObj[priceType] : 0;
return extraPrice;
}
getFinalPrice(selectedAgreement, selectedOptions, selectedAdditionals, priceType) {
let price = selectedAgreement ? selectedAgreement[priceType] : 0;
if(selectedAgreement && selectedOptions) {
Object.keys(selectedOptions).forEach((idGroup) => {
price += this.getExtra(selectedOptions[idGroup], priceType);
});
}
if(selectedAgreement && selectedAdditionals) {
selectedAdditionals.forEach((additional) => {
price += this.getExtra(additional, priceType);
});
}
return price;
}
render() { render() {
const {prices, currency, selectedAgreement, selectedOptions, selectedAdditionals} = this.props; const {prices, currency} = this.props;
return ( return (
<div className="shop-package-pricing"> <div className="shop-package-options shop-package-options-pricing">
<Row className="justify-content-end">
<Col className="col-4">
<h6 className="shop-package-label options-header">{coMarketTexts.labels.ON_DELIVERY}</h6>
</Col>
<Col className="col-4">
<h6 className="shop-package-label options-header">{coMarketTexts.labels.MONTHLY}</h6>
</Col>
</Row>
<div className="shop-package-options">
{ {
prices && prices.map((price) => { prices && prices.map((price) => {
return (<AgreementOptionItemContainer key={'agreement-' + price.idPaymentType} currency={currency} price={price}/>) return (<AgreementOptionItemContainer key={'agreement-' + price.idPaymentType} currency={currency} price={price}/>)
}) })
} }
</div> </div>
<Row className="justify-content-end shop-package-calculated-price">
<Col>
<h6>Price:</h6>
</Col>
<Col className="col-4">
{this.getFinalPrice(selectedAgreement, selectedOptions, selectedAdditionals, 'fixedExtra').toLocaleString()} {currency}
</Col>
<Col className="col-4">
{(this.getFinalPrice(selectedAgreement, selectedOptions, selectedAdditionals, 'recurentExtra')
+ this.getFinalPrice(selectedAgreement, selectedOptions, selectedAdditionals, 'servicesExtra')).toLocaleString()}
{' '}{currency}
</Col>
</Row>
</div>
); );
} }
} }
const mapStateToProps = (state) => ({ export default AgreementOptions;
selectedAgreement: state.coMarketPackageDetailsReducer.selectedAgreement,
selectedOptions: state.coMarketPackageDetailsReducer.selectedOptions,
selectedAdditionals: state.coMarketPackageDetailsReducer.selectedAdditionals
});
export default connect(mapStateToProps) (AgreementOptions);

8
frontend/src/containers/coMarket/components/PackageInfo.jsx
View File

@@ -8,7 +8,7 @@ const fileHandler = new FileDownloader();
class PackageInfo extends Component { class PackageInfo extends Component {
downloadDocument(document){ downloadDocument(document){
const fileUrl = `${API_SERVER}/utils/api/downloadFile?idDocument=${document.idDocument}&fileName=${document.documentName}.${document.extension}` const fileUrl = `${API_SERVER}/wp-json/wiaas/download-package-file?document_id=${document.idDocument}&package_id=${document.idPackage}`
const fileName = document.documentName + '.' + document.extension; const fileName = document.documentName + '.' + document.extension;
fileHandler.download(fileUrl, fileName); fileHandler.download(fileUrl, fileName);
} }
@@ -37,16 +37,14 @@ class PackageInfo extends Component {
{ {
documents && documents.length > 0 && documents && documents.length > 0 &&
<Col lg="12" <Col lg="12"
className="shop-package-details-documents"> className="shop-package-details-documents d-flex flex-column">
<div className="shop-package-label">{coMarketTexts.labels.DOCUMENTS}:</div> <div className="shop-package-label">{coMarketTexts.labels.DOCUMENTS}:</div>
{ {
documents.map((document) => documents.map((document) =>
<div key={document.idDocument}> <span key={document.idDocument} className="document-link"
<span className="document-link"
onClick={() => {this.downloadDocument(document)}}> onClick={() => {this.downloadDocument(document)}}>
<i className="fa fa-file" aria-hidden="true"></i> {document.documentName} ({document.extension}) <i className="fa fa-file" aria-hidden="true"></i> {document.documentName} ({document.extension})
</span> </span>
</div>
) )
} }
</Col> </Col>

80
frontend/src/containers/coMarket/components/PackageOptionGroup.jsx Normal file
View File

@@ -0,0 +1,80 @@
import React, {Component} from 'react';
import {Row, Col, Dropdown, DropdownToggle, DropdownMenu } from 'reactstrap';
import PackageOptionItemContainer from './PackageOptionItemContainer';
import {connect} from 'react-redux';
class PackageOptionGroup extends Component {
constructor(props) {
super(props);
this.toggleDropdown = this.toggleDropdown.bind(this);
this.state = {
dropdownOpen: false
};
}
toggleDropdown(groupKey) {
this.setState({
dropdownOpen: !this.state.dropdownOpen
});
}
getClass() {
if (this.props.selectedOptions && this.props.selectedOptions[this.props.group.idGroup]) {
return 'shop-package-option-selected';
}
return undefined;
}
render() {
const {group, currency, selectedOptions} = this.props;
const selectedGroupOption = selectedOptions ? selectedOptions[group.idGroup] : undefined;
return (
<div key={'group-' + group.idGroup} className={this.getClass()}>
<Dropdown
isOpen={this.state.dropdownOpen}
toggle={this.toggleDropdown}
className="w-100">
<DropdownToggle
caret
className="w-100 d-flex justify-content-between align-items-center"
tag="div"
>
<div className="d-flex flex-column flex-grow-1">
<small className="shop-package-option-header"> {group.groupName}:</small>
{
selectedGroupOption ?
(<PackageOptionItemContainer
option={selectedGroupOption}
currency={currency}
idGroup={group.idGroup}
simplified
/>) :
(<span>Select ...</span>)
}
</div>
</DropdownToggle>
<DropdownMenu className="w-100">
{
group.options.map(option => {
return (<PackageOptionItemContainer
key={option.idOptionPackage}
option={option}
currency={currency}
idGroup={group.idGroup}/>)
})
}
</DropdownMenu>
</Dropdown>
</div>
);
}
}
const mapStateToProps = (state) => ({
selectedAgreement: state.coMarketPackageDetailsReducer.selectedAgreement,
selectedOptions: state.coMarketPackageDetailsReducer.selectedOptions
});
export default connect(mapStateToProps) (PackageOptionGroup);

158
frontend/src/containers/coMarket/components/PackageOptionItemContainer.jsx
View File

@@ -1,6 +1,6 @@
import React, {Component} from 'react'; import React, {Component} from 'react';
import {connect} from 'react-redux'; import {connect} from 'react-redux';
import {Label, Popover, PopoverBody, Input, Col} from 'reactstrap'; import {Label, Input, Col} from 'reactstrap';
import {selectOption} from '../../../actions/coMarket/coMarketPackageDetailsActions'; import {selectOption} from '../../../actions/coMarket/coMarketPackageDetailsActions';
import PriceHelper from '../../../helpers/coMarket/PriceHelper'; import PriceHelper from '../../../helpers/coMarket/PriceHelper';
import {coMarketTexts} from '../../../constants/coMarketConstants'; import {coMarketTexts} from '../../../constants/coMarketConstants';
@@ -11,18 +11,9 @@ class PackageOptionItem extends Component {
constructor(props) { constructor(props) {
super(props); super(props);
this.toggle = this.toggle.bind(this);
this.handleOptionChange = this.handleOptionChange.bind(this); this.handleOptionChange = this.handleOptionChange.bind(this);
this.state = { this.state = {};
popoverOpen: false
};
}
toggle() {
this.setState({
popoverOpen: !this.state.popoverOpen
});
} }
handleOptionChange() { handleOptionChange() {
@@ -30,14 +21,14 @@ class PackageOptionItem extends Component {
} }
isChecked() { isChecked() {
return this.props.selectedOptions return !!this.props.selectedOptions
&& this.props.selectedOptions[this.props.idGroup] && !!this.props.selectedOptions[this.props.idGroup]
&& this.props.selectedOptions[this.props.idGroup].idOptionPackage === this.props.option.idOptionPackage; && this.props.selectedOptions[this.props.idGroup].idOptionPackage === this.props.option.idOptionPackage;
} }
getClass(isChecked) { getClass() {
return isChecked ? return this.isChecked() ?
'selected-option' : 'shop-package-option-selected' :
''; '';
} }
@@ -46,72 +37,101 @@ class PackageOptionItem extends Component {
} }
render() { render() {
const {idGroup, option, country} = this.props; const {idGroup, option, currency, simplified} = this.props;
const selectedPrice = this.props.selectedAgreement ? priceHelper.getSelectedPrice(option, this.props.selectedAgreement) : null; const selectedPrice = this.props.selectedAgreement ? priceHelper.getSelectedPrice(option, this.props.selectedAgreement) : null;
const isAvailable = selectedPrice !== undefined;
const isChecked = this.isChecked(); const isChecked = this.isChecked();
if (simplified) {
return (<div className="d-flex">
<Col className="d-flex align-items-center col-6">
<span className="option-name">
{this.formatName(option.optionName)}
</span>
{
!isAvailable &&
<span className="not-available">
({coMarketTexts.labels.SELECTION_NOT_AVAILABLE})
</span>
}
</Col>
<Col className="d-flex align-items-center col-3">
<span>
{
isAvailable ?
(selectedPrice.fixedExtra ?
`${selectedPrice.fixedExtra} ${currency}` :
'0') :
'-'
}
</span>
</Col>
<Col className="d-flex align-items-center col-3">
<span>
{
isAvailable ?
(priceHelper.hasRecurrentPrice(selectedPrice) ?
`${priceHelper.sumPrices([selectedPrice.recurrentExtra, selectedPrice.servicesExtra])} ${currency}` :
'0') :
'-'
}
</span>
</Col>
</div>)
}
return ( return (
<Col xl="4" lg="4" md="6" xs="6" className="option-value"> <div
<div className={'form-check-inline option-selection ' + this.getClass(isChecked)}> id={'info-option-' + idGroup + '-' + option.idOptionPackage}
<Label check> className={`shop-package-option d-flex ${this.getClass()}`}
>
<Label check className="d-flex flex-grow-1 flex-column">
<div className="d-flex">
<Col className="col-6 d-flex align-items-center">
<Input type="radio" <Input type="radio"
name={'package-option-'+ idGroup} name={'package-option-'+ idGroup}
className="package-option-input" className="package-option-input"
onChange={this.handleOptionChange} onChange={this.handleOptionChange}
checked={isChecked} checked={isChecked}
value={option.idOptionPackage}/> value={option.idOptionPackage}/>
<div className="option-name">{this.formatName(option.optionName)}</div> <div className="option-name">
<div className="option-description" dangerouslySetInnerHTML={{__html: option.shortDescription}}></div> {this.formatName(option.optionName)}
</div>
{ {
priceHelper.hasFixedPrice(selectedPrice) && !isAvailable &&
<div className="option-prices"> <span className="not-available">
<table className="price-table option-price-table"> ({coMarketTexts.labels.SELECTION_NOT_AVAILABLE})
<thead> </span>
<tr>
<th>{coMarketTexts.labels.ON_DELIVERY}</th>
<th>{coMarketTexts.labels.MONTHLY}</th>
</tr>
</thead>
<tbody>
<tr>
<td>{selectedPrice.fixedExtra && selectedPrice.fixedExtra.toLocaleString() + ' ' + country.currency} </td>
<td>
{
priceHelper.hasRecurrentPrice(selectedPrice) ?
<div className="option-value-text monthly-price">
{priceHelper.sumPrices([selectedPrice.recurentExtra, selectedPrice.servicesExtra]).toLocaleString()} {country.currency}
</div>
: <div className="option-value-text monthly-price"> 0 </div>
} }
</td>
</tr>
</tbody>
</table>
</div>
}
</Label>
{
!selectedPrice &&
<Label>
<div className="not-available">
({coMarketTexts.labels.NOT_AVAILABLE})
<i className="price-info-btn fa fa-info-circle"
aria-hidden="true"
id={'info-option-' + idGroup + '-' + option.idOptionPackage}
onClick={this.toggle}></i>
</div>
</Label>
}
</div>
<Popover placement="bottom"
isOpen={this.state.popoverOpen}
target={'info-option-' + idGroup + '-' + option.idOptionPackage}
toggle={this.toggle}>
<PopoverBody>
{coMarketTexts.labels.SELECTION_NOT_AVAILABLE}
</PopoverBody>
</Popover>
</Col> </Col>
<Col className="col-3 d-flex align-items-center">
<span>
{
isAvailable ?
(selectedPrice.fixedExtra ?
`${selectedPrice.fixedExtra} ${currency}` :
'0') :
'-'
}
</span>
</Col>
<Col className="col-3 d-flex align-items-center">
<span>
{
isAvailable ?
(priceHelper.hasRecurrentPrice(selectedPrice) ?
`${priceHelper.sumPrices([selectedPrice.recurrentExtra, selectedPrice.servicesExtra])} ${currency}` :
'0') :
'-'
}
</span>
</Col>
</div>
<div
className="shop-package-option-description"
dangerouslySetInnerHTML={{__html: option.shortDescription}}></div>
</Label>
</div>
); );
} }
} }

35
frontend/src/containers/coMarket/components/PackageOptions.jsx
View File

@@ -1,35 +0,0 @@
import React, {Component} from 'react';
import {Row} from 'reactstrap';
import PackageOptionItemContainer from './PackageOptionItemContainer.jsx';
import {coMarketTexts} from '../../../constants/coMarketConstants';
class PackageOptions extends Component {
render() {
const {groups, country} = this.props;
return (
<div className="shop-package-options">
<h6 className="shop-package-label options-header">{coMarketTexts.labels.PACKAGE_OPTIONS}</h6>
{
Object.keys(groups).map(groupKey => {
const group = groups[groupKey];
return <div key={'group-' + group.idGroup} className="package-option">
<h6 className="shop-package-label"> {group.groupName}:</h6>
<Row>
{
group.options.map(option => {
return <PackageOptionItemContainer key={'option-' + group.idGroup + option.idOptionPackage}
option={option}
country={country}
idGroup={group.idGroup}/>
})
}
</Row>
</div>
})
}
</div>
);
}
}
export default PackageOptions;

72
frontend/src/containers/coMarket/components/PackagePrice.jsx
View File

@@ -1,5 +1,6 @@
import React, {Component} from 'react'; import React, {Component} from 'react';
import {connect} from 'react-redux'; import {connect} from 'react-redux';
import { Col } from 'reactstrap';
import {coMarketTexts} from '../../../constants/coMarketConstants'; import {coMarketTexts} from '../../../constants/coMarketConstants';
class PackagePrice extends Component { class PackagePrice extends Component {
@@ -38,34 +39,55 @@ class PackagePrice extends Component {
return price; return price;
} }
getFormatedFixedPrice(selectedAgreement, selectedOptions, selectedAdditionals) {
if (!selectedAgreement) {
return '-';
}
const finalPrice = this.getFinalPrice(
selectedAgreement,
selectedOptions,
selectedAdditionals,
'fixedExtra');
return `${finalPrice.toLocaleString()} ${this.props.currency}`
}
getFormatedRecurrentPrice(selectedAgreement, selectedOptions, selectedAdditionals) {
if (!selectedAgreement) {
return '-';
}
const recurrentExtra = this.getFinalPrice(selectedAgreement, selectedOptions, selectedAdditionals, 'recurrentExtra');
const servicesExtra = this.getFinalPrice(selectedAgreement, selectedOptions, selectedAdditionals, 'servicesExtra');
return `${(recurrentExtra + servicesExtra).toLocaleString()} ${this.props.currency}`
}
render() { render() {
const {currency, selectedAgreement, selectedOptions, selectedAdditionals} = this.props; const {selectedAgreement, selectedOptions, selectedAdditionals} = this.props;
return ( return (
<div className="selection-price"> <div className="shop-package-price d-flex flex-column">
{ <div className="d-flex flex-grow-1 no-wrap">
selectedAgreement && <Col className="col-3 offset-6">
<table className="price-table main-price"> <h6>{coMarketTexts.labels.ON_DELIVERY}:</h6>
<thead> </Col>
<tr> <Col className="col-3">
<th>{coMarketTexts.labels.ON_DELIVERY}</th> <h6>{coMarketTexts.labels.MONTHLY}:</h6>
<th>{coMarketTexts.labels.MONTHLY}</th> </Col>
</tr> </div>
</thead> <div className="d-flex flex-grow-1 no-wrap">
<tbody> <Col className="col-3 offset-6">
<tr> <h4>
<td> {this.getFormatedFixedPrice(selectedAgreement, selectedOptions, selectedAdditionals)}
{this.getFinalPrice(selectedAgreement, selectedOptions, selectedAdditionals, 'fixedExtra').toLocaleString()} {currency} </h4>
</td> </Col>
<td> <Col className="col-3">
{(this.getFinalPrice(selectedAgreement, selectedOptions, selectedAdditionals, 'recurentExtra') <h4>
+ this.getFinalPrice(selectedAgreement, selectedOptions, selectedAdditionals, 'servicesExtra')).toLocaleString()} {this.getFormatedRecurrentPrice(selectedAgreement, selectedOptions, selectedAdditionals)}
{' '}{currency} </h4>
</td> </Col>
</tr> </div>
</tbody>
</table>
}
</div> </div>
); );
} }

43
frontend/src/containers/coMarket/style/CoMarket.scss
View File

@@ -1,6 +1,29 @@
@import '../../../styleConstants.scss'; @import '../../../styleConstants.scss';
#co-market-shop { #co-market-shop {
.shop-package-item{
margin-top: 1rem;
border-radius: 0;
background-color: $whiteColor;
// box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.1);
.card-body {
background: rgb(251, 251, 251);
}
.shop-package-details-btn{
border-radius: 50px;
background-color: $accentColor;
border: none;
color: $whiteColor;
font-weight: $font-weight;
font-size: $font-size-xsmal;
cursor: pointer;
&:focus, &:hover {
box-shadow: 0 0 0 0.1rem lighten($accentColor, 0.9) !important;
}
}
.shop-package-title { .shop-package-title {
font-size: 1rem; font-size: 1rem;
height: 2rem; height: 2rem;
@@ -18,6 +41,7 @@
font-weight: $font-weight; font-weight: $font-weight;
text-align: left; text-align: left;
color: $warmGreyColor; color: $warmGreyColor;
margin-bottom: 2rem;
} }
.shop-package-country { .shop-package-country {
@@ -34,28 +58,13 @@
text-align: right; text-align: right;
} }
.shop-package-details-btn{
border-radius: 50px;
background-color: $whiteColor;
border: solid 0.7px $borderColor;
color: $darkBlue;
font-weight: $font-weight;
font-size: $font-size-xsmal;
cursor: pointer;
}
.shop-package-item{
margin-top: 1rem;
border-radius: 4px;
background-color: $whiteColor;
box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.1);
}
.flag-icon{ .flag-icon{
border-radius: 2px; border-radius: 2px;
margin-left: 0.2rem; margin-left: 0.2rem;
} }
}
.wiaas-box-header { .wiaas-box-header {
padding: 1rem; padding: 1rem;
align-items: center; align-items: center;

158
frontend/src/containers/coMarket/style/CoMarketPackageDetailsContainer.scss
View File

@@ -31,6 +31,8 @@
.shop-package-label{ .shop-package-label{
display: inline-block; display: inline-block;
color: $font-light-color;
font-weight: 600;
} }
.shop-package-text { .shop-package-text {
@@ -48,6 +50,7 @@
.document-link{ .document-link{
color: #33425b; color: #33425b;
padding: 6px 12px;
cursor: pointer; cursor: pointer;
} }
} }
@@ -55,23 +58,68 @@
#shop-package-buy-info{ #shop-package-buy-info{
padding: 2rem; padding: 2rem;
.shop-package-pricing {
> div.row {
margin: 0 32px 0 0;
}
}
.shop-package-calculated-price {
font-weight: $font-weight;
}
.shop-package-options{ .shop-package-options{
margin: 1rem 0; margin: 1rem 0;
input[type=radio], input[type=checkbox] {
position: relative;
margin: 0 10px 0 0;
}
.option-name {
color: $font-dark-color;
}
.dropdown-toggle {
border: 1px solid $hoverColor;
border-radius: $box-radius;
padding: 0.375rem 0.75rem;
cursor: pointer;
margin: 20px 0;
}
.shop-package-option {
&-selected {
background: $lightHoverColor;
}
&-disabled {
.option-name {
opacity: 0.5;
}
}
&:not(.shop-package-option-disabled) {
&:hover {
background: $hoverColor;
}
label {
cursor: pointer;
}
}
&-header {
color: $font-light-color;
font-weight: 600;
}
&-description {
padding-top: 0.5rem;
font-size: $font-size-msmall;
margin-left: 38px;
color: $font-light-color;
}
label {
padding: 0.375rem 0.75rem;
margin-right: 0.855rem;
}
}
&-pricing {
border-bottom: 2px solid $title-color; border-bottom: 2px solid $title-color;
margin: 3rem 0;
label {
margin-right: 0 !important;
min-height: 3rem;
padding-right: 0 !important;
}
}
} }
.not-available { .not-available {
margin-top: 1rem;
margin-left: 0.2rem; margin-left: 0.2rem;
color: $not-available-status-color; color: $not-available-status-color;
font-weight: $font-weight; font-weight: $font-weight;
@@ -79,93 +127,31 @@
} }
.price-info-btn { .price-info-btn {
color: $info-color;
cursor: pointer; cursor: pointer;
padding: 0.5rem; width: 1.605rem;
padding: 0.4rem;
} }
.add-to-cart-btn { .add-to-cart-btn {
cursor: pointer; cursor: pointer;
color: $darkGreyColor; color: #fff;
background-color: $whiteColor; background-color: $accentColor;
border-color:$warmGreyColor; border: none;
&:focus, &:hover {
box-shadow: 0 0 0 0.1rem lighten($accentColor, 0.9) !important;
} }
.selected-option {
background: $hoverColor;
}
.option-selection {
padding: 0.5rem 0;
margin: 0;
flex-wrap: nowrap;
> label {
cursor: pointer;
margin: 0;
flex-wrap: nowrap;
}
input.price-type-option {
position: relative;
margin: 0 10px 0 0;
}
span.option-name {
font-size: $font-size-small;
}
}
.option-selection:hover {
background: $footer-background;
color: $whiteColor;
}
.option-selection:hover .price-info-btn {
color: $whiteColor;
}
.option-description {
padding-top: 0.5rem;
font-size: $font-size-msmall;
height: 2rem;
}
.price-info-popover {
max-width: 50rem;
} }
.recurent-total-price{ .recurent-total-price{
font-size: $font-size-msmall; font-size: $font-size-msmall;
} }
.selection-price{ .shop-package-price{
background: $hoverColor; margin: 1rem 0.855rem 1rem 0;
display: inline-block; padding: 0.375rem 0.75rem;
border-radius: $box-radius; h6 {
font-size: $font-size-big; color: $font-light-color;
font-weight: bold; }
}
.price-table {
width: 8rem;
}
.main-price {
width: auto;
}
.price-table th{
padding: 0.5rem;
}
.price-table td{
border-top: 1px solid $darkGreyColor;
padding: 0.5rem;
}
.option-price-table{
font-size: $font-size-xsmal;
} }
} }

13
frontend/src/helpers/OrderHelper.js
View File

@@ -24,7 +24,7 @@ export const fromWCOrder = (WCOrder) => {
reference: WCOrder['reference'], reference: WCOrder['reference'],
assignedTo: 'assigned to', assignedTo: 'assigned to',
fixedPrice: WCOrder.total, fixedPrice: WCOrder.total,
recurringPrice: 0, recurringPrice: WCOrder['recurring_price'],
status: WCOrder.status, status: WCOrder.status,
currency: WCOrder.currency, currency: WCOrder.currency,
billing:{ billing:{
@@ -49,6 +49,15 @@ export const fromWCOrder = (WCOrder) => {
payPeriod: packageLine['pay_period'], payPeriod: packageLine['pay_period'],
shortDesc: packageLine['short_desc'], shortDesc: packageLine['short_desc'],
dateCompleted: formatDate(packageLine['date_completed']), dateCompleted: formatDate(packageLine['date_completed']),
additionalPackages: packageLine['additional_packages'] ? packageLine['additional_packages'].map(additionalPackage => ({
idPackage: additionalPackage.id,
packageName: additionalPackage.name,
})) : [],
options: packageLine['options'] ? packageLine['options'].map(packageOption => ({
idPackage: packageOption.id,
packageName: packageOption.name,
groupName: packageOption['group_name'] || '',
})) : [],
}; };
}), }),
process: processInfo, process: processInfo,
@@ -61,6 +70,6 @@ export const fromWCOrder = (WCOrder) => {
})) : [], })) : [],
deliveryAddress: formatAddress(WCOrder.shipping), deliveryAddress: formatAddress(WCOrder.shipping),
customer: WCOrder.customer, customer: WCOrder.customer,
commercialLead: WCOrder['commercial_lead'] commercialLead: WCOrder['commercial_lead'],
} }
}; };

74
frontend/src/helpers/PackageHelper.js
View File

@@ -1,6 +1,44 @@
const DEFAULT_PACKAGE_IMG = 'static/img/no-photo-package.jpg'; const DEFAULT_PACKAGE_IMG = 'static/img/no-photo-package.jpg';
function extractPrices(wcPackageId, prices) {
return prices.map(price => ({
idPrice: price.id,
idPaymentType: price.id,
payType: price['payment_type'],
isSameCompanyAsCl: false,
idPackage: wcPackageId,
periodUnit: price['period_unit'],
maxContractPeriod: price['max_contract_period'],
packagePayPeriod: price['package_pay_period'],
servicesContractPeriod: price['services_contract_period'],
fixedExtra: price['fixed_extra'],
servicesExtra: price['services_extra'],
recurrentExtra: price['recurrent_extra']
}));
}
function extractGroups(wcPackageGroups) {
const extractedGroups = {};
Object.keys(wcPackageGroups).forEach(key => {
const group = wcPackageGroups[key];
extractedGroups[key] = {
groupName: group.name,
idGroup: group.id,
options: group.options.map(option => ({
idOptionPackage: option.id,
optionName: option.name,
isDefault: option.default,
shortDescription: option.description,
prices: extractPrices(option.id, option.prices),
})),
};
});
return extractedGroups;
}
export const fromWCPackage = wcPackage => { export const fromWCPackage = wcPackage => {
return { return {
id: wcPackage.id, id: wcPackage.id,
@@ -8,25 +46,23 @@ export const fromWCPackage = wcPackage => {
image: wcPackage.images[0].src || DEFAULT_PACKAGE_IMG, image: wcPackage.images[0].src || DEFAULT_PACKAGE_IMG,
hasImage: !!wcPackage.images.length, hasImage: !!wcPackage.images.length,
name: wcPackage.name, name: wcPackage.name,
country: 'Sweden', country: wcPackage.country,
countryCode: 'se', countryCode: wcPackage['country_code'],
currency: 'SEK', currency: wcPackage.currency,
documents: [], documents: wcPackage.documents ? wcPackage.documents.map(document => ({
shortDescription: wcPackage.description, idDocument: document.id,
prices: wcPackage.prices.map(price => ({ documentName: document.name,
idPrice: price.id, extension: document.extension,
idPaymentType: price.id,
payType: price['payment_type'],
isSameCompanyAsCl: false,
idPackage: wcPackage.id, idPackage: wcPackage.id,
periodUnit: price['period_unit'], })) : [],
maxContractPeriod: price['max_contract_period'], shortDescription: wcPackage.description,
packagePayPeriod: price['package_pay_period'], prices: extractPrices(wcPackage.id, wcPackage.prices || []),
servicesContractPeriod: price['services_contract_period'], groups: extractGroups(wcPackage.groups || {}),
fixedExtra: price['minimal_fixed_price'], additionalPackages: wcPackage['additional_packages'] ? wcPackage['additional_packages'].map(additionalPackage =>({
servicesExtra: price['minimal_services_price'], idAdditionalPackage: additionalPackage.id,
recurentExtra: price['recurrent_price'] packageName: additionalPackage.name,
})) || [], shortDescription: additionalPackage.description,
groups: [], prices: extractPrices(additionalPackage.id, additionalPackage.prices)
})) : [],
} }
}; };

6
frontend/src/helpers/coMarket/PriceHelper.js
View File

@@ -19,7 +19,11 @@ class PriceHellper {
} }
hasRecurrentPrice(selectedPrice){ hasRecurrentPrice(selectedPrice){
return selectedPrice && (selectedPrice.recurentExtra > 0 || selectedPrice.servicesExtra > 0); return selectedPrice && (selectedPrice.recurrentExtra > 0 || selectedPrice.servicesExtra > 0);
}
calculateCartItemTotal(cartItem) {
} }
} }

9
frontend/src/mainComponents/dialog/DialogBox.scss
View File

@@ -95,10 +95,13 @@
.generic-dialog-box { .generic-dialog-box {
min-width: 30%; min-width: 30%;
.btn-success { .btn-success, .btn-success:active, .btn-success:hover, .btn-success:focus {
background-color: $greenColor; background-color: $accentColor !important;
border-color: $borderColor; border: none !important;
cursor: pointer; cursor: pointer;
&:focus, &:hover {
box-shadow: 0 0 0 0.1rem lighten($accentColor, 0.9) !important;
}
} }
.btn-secondary { .btn-secondary {

11
frontend/src/styleConstants.scss
View File

@@ -12,8 +12,10 @@ $ricohRed: #d2063a;
$greenColor: #34c388; $greenColor: #34c388;
$shadow-color: rgba(0, 0, 0, 0.07); $shadow-color: rgba(0, 0, 0, 0.07);
$blueColor: #2b6279; $blueColor: #2b6279;
$hoverColor: #F8F8F8; $hoverColor: #ebebeb;
$lightHoverColor: rgba(126, 126, 126, 0.1); $lightHoverColor: #f2f2f2;
$accentColor: #e25c56;
$boxShadow: rgba(0, 0, 0, 0.1); $boxShadow: rgba(0, 0, 0, 0.1);
@@ -37,6 +39,9 @@ $font-size-normal: 1rem; //16px
$font-size-big: 1.125rem; //18px $font-size-big: 1.125rem; //18px
$font-size-xbig: 1.5rem; $font-size-xbig: 1.5rem;
$font-light-color: rgba(33, 33, 33, 0.54);
$font-dark-color: rgba(33, 33, 33, 0.87);
$open-status-color: #045FB4; $open-status-color: #045FB4;
$in-progress-status-color: #FD8049; $in-progress-status-color: #FD8049;
$end-of-life-status-color: #34C388;//#800080 $end-of-life-status-color: #34C388;//#800080
@@ -57,5 +62,3 @@ $warm-grey: #7e7e7e;
$info-color: #337ab7; $info-color: #337ab7;
$danger: #F70D1A; $danger: #F70D1A;
$warning: #FF8040; $warning: #FF8040;
$cart-count-color: #FFD3A1;