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

Extra commision column now split into 3 , and tooltip added #84

Merged
nedimu merged 4 commits from abbrevations into development 2018-12-06 12:08:25 +01:00
Conversation 7 Commits 4 Files Changed 6 +212 -61
6 changed files with 212 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

119
backend/app/plugins/wiaas/assets/css/menu.css
View File

@@ -62,3 +62,122 @@
.gravityflow-dicussion-item-value { .gravityflow-dicussion-item-value {
padding: 10px; padding: 10px;
} }
.woocommerce-help-tip{
color:#666;
display:inline-block;
font-size:1.1em;
font-style:normal;
height:16px;
line-height:16px;
position:relative;
vertical-align:middle;
width:16px}
.woocommerce-help-tip::after{
font-family:Dashicons;
speak:none;
font-weight:400;
font-variant:normal;
text-transform:none;
line-height:1;
-webkit-font-smoothing:antialiased;
margin:0;
text-indent:0;
position:absolute;
top:0;
left:0;
width:100%;
height:100%;
text-align:center;
content:"";
cursor:help
}
h2 .woocommerce-help-tip{
margin-top:-5px;
margin-left:.25em
}
/**
* Tooltips
*/
.tips {
cursor: help;
text-decoration: none;
}
img.tips {
padding: 5px 0 0;
}
#tiptip_holder {
display: none;
z-index: 8675309;
position: absolute;
top: 0;
/*rtl:ignore*/
left: 0;
}
#tiptip_holder.tip_top {
padding-bottom: 5px;
}
#tiptip_holder.tip_top #tiptip_arrow_inner {
margin-top: -7px;
margin-left: -6px;
border-top-color: #333;
}
#tiptip_holder.tip_bottom {
padding-top: 5px;
}
#tiptip_holder.tip_bottom #tiptip_arrow_inner {
margin-top: -5px;
margin-left: -6px;
border-bottom-color: #333;
}
#tiptip_holder.tip_right {
padding-left: 5px;
}
#tiptip_holder.tip_right #tiptip_arrow_inner {
margin-top: -6px;
margin-left: -5px;
border-right-color: #333;
}
#tiptip_holder.tip_left {
padding-right: 5px;
}
#tiptip_holder.tip_left #tiptip_arrow_inner {
margin-top: -6px;
margin-left: -7px;
border-left-color: #333;
}
#tiptip_content,
.chart-tooltip,
.wc_error_tip {
color: #fff;
font-size: 0.8em;
max-width: 150px;
background: #333;
text-align: center;
border-radius: 3px;
padding: 0.618em 1em;
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.2);
}
#tiptip_content code,
.chart-tooltip code,
.wc_error_tip code {
padding: 1px;
background: #888;
}
#tiptip_arrow,
#tiptip_arrow_inner {
position: absolute;
border-color: transparent;
border-style: solid;
border-width: 6px;
height: 0;
width: 0;
}

10
backend/app/plugins/wiaas/assets/js/wiaas-admin-cl-packages.js
View File

@@ -1,5 +1,15 @@
jQuery(document).ready(function ($) { jQuery(document).ready(function ($) {
$( document.body ).on( 'init_tooltips', function() {
$( '.woocommerce-help-tip' ).tipTip( {
'attribute': 'data-tip',
'fadeIn': 50,
'fadeOut': 50,
'delay': 200,
'defaultPosition': 'top'
} );
} ).trigger( 'init_tooltips' );
$('#tabs').each(function() { $('#tabs').each(function() {
var disabled = $( this ).data('disabled') || ''; var disabled = $( this ).data('disabled') || '';

1
backend/app/plugins/wiaas/includes/admin/admin-cl/class-wiaas-admin-cl-packages.php
View File

@@ -40,6 +40,7 @@ class Wiaas_Admin_CL_Packages {
$plugin_url = untrailingslashit( plugins_url( '/', WIAAS_FILE ) ); $plugin_url = untrailingslashit( plugins_url( '/', WIAAS_FILE ) );
wp_enqueue_style( 'wiaas_admin_menu', $plugin_url . '/assets/css/menu.css' ); wp_enqueue_style( 'wiaas_admin_menu', $plugin_url . '/assets/css/menu.css' );
} }
public static function add_cl_packages_menu() { public static function add_cl_packages_menu() {

19
backend/app/plugins/wiaas/includes/admin/admin-cl/views/html-cl-package-details.php
View File

@@ -149,25 +149,6 @@ if ( ! defined( 'ABSPATH' ) ) {
<div class="inside"> <div class="inside">
<div class="panel-wrap"> <div class="panel-wrap">
<div class="panel"> <div class="panel">
<div class="wrap">
<div>
<i style="vertical-align: middle;" class="dashicons dashicons-info"></i>
<strong><?php esc_html_e('EPR', 'wiaas') ?></strong>
<span><?php esc_html_e('= Extra package recurrent commission', 'wiaas') ?></span>
</div>
<div>
<i style="vertical-align: middle;" class="dashicons dashicons-info"></i>
<strong><?php esc_html_e('ESR') ?></strong>
<span><?php esc_html_e('= Extra services and support recurrent commission', 'wiaas') ?></span>
</div>
<div>
<i style="vertical-align: middle;" class="dashicons dashicons-info"></i>
<strong><?php esc_html_e('Extra commission', 'wiaas') ?></strong>
<span><?php esc_html_e('= EPR + ESR', 'wiaas') ?></span>
</div>
</div>
<div id="tabs" data-disabled="<?php echo $has_default_cl_extras ? '' : '1' ; ?>"> <div id="tabs" data-disabled="<?php echo $has_default_cl_extras ? '' : '1' ; ?>">
<ul id="tabs-navigation"> <ul id="tabs-navigation">
<li><a href="#tabs-1"><?php esc_html_e('Default prices', 'wiaas') ?></a> | </li> <li><a href="#tabs-1"><?php esc_html_e('Default prices', 'wiaas') ?></a> | </li>

123
backend/app/plugins/wiaas/includes/admin/admin-cl/views/html-cl-package-prices.php
View File

@@ -20,7 +20,13 @@ $id = isset($customer_id) ? 'extras_customer_'.$customer_id : 'extras_default';
?> ?>
</td> </td>
<td><?php esc_html_e('Minimal sell price', 'wiaas') ?></td> <td><?php esc_html_e('Minimal sell price', 'wiaas') ?></td>
<td><?php esc_html_e('Extra commision', 'wiaas') ?></td> <td><?php esc_html_e('Margin', 'wiaas') ?></td>
<td><?php esc_html_e('Margin services', 'wiaas') ?>
<?php echo wc_help_tip( __( 'Extra services and support recurrent commission', 'wiaas' ) );?>
</td>
<td><?php esc_html_e('Margin recurrent', 'wiaas') ?>
<?php echo wc_help_tip( __( 'Extra package recurrent commission', 'wiaas' ) );?>
</td>
<td><?php esc_html_e('Default price', 'wiaas') ?></td> <td><?php esc_html_e('Default price', 'wiaas') ?></td>
<td><?php esc_html_e('Visible?', 'wiaas') ?> <td><?php esc_html_e('Visible?', 'wiaas') ?>
<?php <?php
@@ -81,48 +87,81 @@ $id = isset($customer_id) ? 'extras_customer_'.$customer_id : 'extras_default';
</div> </div>
</td> </td>
<td class="form-group"> <td class="form-group">
<div class="form-control"> <div class="form-control">
<label>+</label> <label>+</label>
<input <input
class="wiaas-cl-extra-input"
data-target="wiaas_cl_fixed_extra_<?php esc_attr_e($extra_type, 'wiaas') ?>"
data-type="fixed"
name="cl_extras[<?php esc_attr_e($extra_type, 'wiaas')?>][fixed]"
value="<?php esc_attr_e($cl_extras[$extra_type]['fixed'], 'wiaas') ?>"
type="text"
>
</div>
<?php
if($configured_price['package_pay_period'] > 0) {
?>
<div class="form-control">
<label>+</label>
<input
class="wiaas-cl-extra-input" class="wiaas-cl-extra-input"
data-target="wiaas_cl_recurrent_extra_<?php esc_attr_e($extra_type, 'wiaas') ?>" data-target="wiaas_cl_fixed_extra_<?php esc_attr_e($extra_type, 'wiaas') ?>"
data-type="recurrent" data-type="fixed"
name="cl_extras[<?php esc_attr_e($extra_type, 'wiaas')?>][recurrent]" name="cl_extras[<?php esc_attr_e($extra_type, 'wiaas')?>][fixed]"
value="<?php esc_attr_e($cl_extras[$extra_type]['recurrent'], 'wiaas') ?>" value="<?php esc_attr_e($cl_extras[$extra_type]['fixed'], 'wiaas') ?>"
type="text" type="text"
> >
<label><?php esc_html_e('(EPR)', 'wiaas') ?></label> </div>
</div> <div class="form-control">
<?php <label>+</label>
} <input
?> class="wiaas-cl-extra-input"
<div class="form-control"> type="text"
<label>+</label> readonly
<input value="0"
class="wiaas-cl-extra-input" >
data-target="wiaas_cl_monthly_extra_<?php esc_attr_e($extra_type, 'wiaas') ?>" </div>
data-type="services" </td>
name="cl_extras[<?php esc_attr_e($extra_type, 'wiaas')?>][services]"
value="<?php esc_attr_e($cl_extras[$extra_type]['services'], 'wiaas') ?>" <td class="form-group">
type="text" <div class="form-control">
> <label>+</label>
<label><?php esc_html_e('(ESR)', 'wiaas') ?></label> <input
</div> class="wiaas-cl-extra-input"
type="text"
readonly
value="0"
>
</div>
<div class="form-control">
<label>+</label>
<input
class="wiaas-cl-extra-input"
data-target="wiaas_cl_monthly_extra_<?php esc_attr_e($extra_type, 'wiaas') ?>"
data-type="services"
name="cl_extras[<?php esc_attr_e($extra_type, 'wiaas')?>][services]"
value="<?php esc_attr_e($cl_extras[$extra_type]['services'], 'wiaas') ?>"
type="text"
>
</div>
</td>
<td class="form-group">
<?php
if($configured_price['package_pay_period'] > 0) {
?>
<div class="form-control">
<label>+</label>
<input
class="wiaas-cl-extra-input"
type="text"
readonly
value="0"
>
</div>
<div class="form-control">
<label>+</label>
<input
class="wiaas-cl-extra-input"
data-target="wiaas_cl_recurrent_extra_<?php esc_attr_e($extra_type, 'wiaas') ?>"
data-type="recurrent"
name="cl_extras[<?php esc_attr_e($extra_type, 'wiaas')?>][recurrent]"
value="<?php esc_attr_e($cl_extras[$extra_type]['recurrent'], 'wiaas') ?>"
type="text"
>
</div>
<?php
}
?>
</td> </td>
<td> <td>
<div> = <div> =

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

@@ -37,6 +37,7 @@ class Wiaas_Admin_CL {
$plugin_url = untrailingslashit( plugins_url( '/', WIAAS_FILE ) ); $plugin_url = untrailingslashit( plugins_url( '/', WIAAS_FILE ) );
wp_enqueue_script( 'wiaas_admin_cl_packages', $plugin_url . '/assets/js/wiaas-admin-cl-packages.js' ); wp_enqueue_script( 'wiaas_admin_cl_packages', $plugin_url . '/assets/js/wiaas-admin-cl-packages.js' );
wp_enqueue_script('jquery-tiptip');
wp_enqueue_style( 'wiaas_admin_cl', $plugin_url . '/assets/css/wiaas-admin-cl.css' ); wp_enqueue_style( 'wiaas_admin_cl', $plugin_url . '/assets/css/wiaas-admin-cl.css' );
} }