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

Bugfixes #89

Merged
bilal.catic merged 49 commits from development into master 2018-12-13 13:25:17 +01:00
Conversation 3 Commits 49 Files Changed 86 +28 -7
1 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ba0549b9fb - Show all commits

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

@@ -21,8 +21,12 @@ $id = isset($customer_id) ? 'extras_customer_'.$customer_id : 'extras_default';
</td>
<td><?php esc_html_e('Minimal sell price', 'wiaas') ?></td>
<td><?php esc_html_e('Margin', 'wiaas') ?></td>
<td><?php esc_html_e('Margin services', 'wiaas') ?></td>
<td><?php esc_html_e('Margin recurrent', '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('Visible?', 'wiaas') ?>
<?php
@@ -95,12 +99,23 @@ $id = isset($customer_id) ? 'extras_customer_'.$customer_id : 'extras_default';
type="text"
>
</div>
<div class="form-control">
<input
class="wiaas-cl-extra-input"
type="text"
style="visibility: hidden;"
>
</div>
</td>
<td class="form-group">
<div class="form-control">
<input
class="wiaas-cl-extra-input"
type="text"
style="visibility: hidden;"
>
</div>
<div class="form-control">
<label>+</label>
<input
@@ -110,11 +125,18 @@ $id = isset($customer_id) ? 'extras_customer_'.$customer_id : 'extras_default';
name="cl_extras[<?php esc_attr_e($extra_type, 'wiaas')?>][services]"
value="<?php esc_attr_e($cl_extras[$extra_type]['services'], 'wiaas') ?>"
type="text"
><?php echo wc_help_tip( __( 'Extra services and support recurrent commission', 'wiaas' ) );?>
>
</div>
</td>
<td class="form-group">
<div class="form-control">
<input
class="wiaas-cl-extra-input"
type="text"
style="visibility: hidden;"
>
</div>
<?php
if($configured_price['package_pay_period'] > 0) {
?>
@@ -128,7 +150,6 @@ $id = isset($customer_id) ? 'extras_customer_'.$customer_id : 'extras_default';
value="<?php esc_attr_e($cl_extras[$extra_type]['recurrent'], 'wiaas') ?>"
type="text"
>
<?php echo wc_help_tip( __( 'Extra package recurrent commission', 'wiaas' ) );?>
</div>
<?php
}