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

Fix tests

Browse Source
This commit is contained in:
Almira Krdzic
2018-10-15 05:06:46 +02:00
parent e810dd086a
commit f14d35b1aa
17 changed files with 245 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,7 +32,7 @@ class Wiaas_Admin_CL_Packages {
add_menu_page(
__( 'Products', 'wiaas' ),
__( 'Products', 'wiaas' ),
'wiaas_manage_cl_products',
'manage_wiaas_cl_products',
'wiaas-cl-packages',
array(__CLASS__, 'output_list'),
null,
@@ -42,7 +42,7 @@ class Wiaas_Admin_CL_Packages {
null,
__( 'Products', 'wiaas' ),
null,
'wiaas_manage_cl_products',
'manage_wiaas_cl_products',
'wiaas-cl-product',
array(__CLASS__, 'output_package')
);

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

@@ -218,25 +218,25 @@ if ( ! defined( 'ABSPATH' ) ) {
<div class="wrap">
<div>
<i style="vertical-align: middle;" class="dashicons dashicons-info"></i>
<strong><?php esc_html_e('EPR') ?></strong>
<span><?php esc_html_e('= Extra package recurrent commission') ?></span>
<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') ?></span>
<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') ?></strong>
<span><?php esc_html_e('= EPR + ESR') ?></span>
<strong><?php esc_html_e('Extra commission', 'wiaas') ?></strong>
<span><?php esc_html_e('= EPR + ESR', 'wiaas') ?></span>
</div>
</div>
<div id="tabs">
<ul id="tabs-navigation">
<li><a href="#tabs-1">Default prices</a> | </li>
<li><a href="#tabs-2">Customer specific prices</a></li>
<li><a href="#tabs-1"><?php esc_html_e('Default prices', 'wiaas') ?></a> | </li>
<li><a href="#tabs-2"><?php esc_html_e('Customer specific prices', 'wiaas') ?></a></li>
</ul>
<form id="wiaas_package_extras" action="" method="post">
@@ -256,6 +256,11 @@ if ( ! defined( 'ABSPATH' ) ) {
<?php
$customers = wiaas_get_customers();
foreach ($customers as $id => $name) {
// shik current organization if it has role of customer
if ($id === $cl_id) {
continue;
}
?>
<option
<?php disabled(in_array($id, $customer_ids_with_extras), true, true) ?>

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

@@ -19,10 +19,10 @@ $id = isset($customer_id) ? 'extras_customer_'.$customer_id : 'extras_default';
}
?>
</td>
<td>Minimal sell price</td>
<td>Extra commision</td>
<td>Default price</td>
<td>Visible?
<td><?php esc_html_e('Minimal sell price', 'wiaas') ?></td>
<td><?php esc_html_e('Extra commision', 'wiaas') ?></td>
<td><?php esc_html_e('Default price', 'wiaas') ?></td>
<td><?php esc_html_e('Visible?', 'wiaas') ?>
<?php
if (isset($customer_id)) {
?>
@@ -106,7 +106,7 @@ $id = isset($customer_id) ? 'extras_customer_'.$customer_id : 'extras_default';
value="<?php esc_attr_e($cl_extras[$extra_type]['recurrent'], 'wiaas') ?>"
type="text"
>
<label>(EPR)</label>
<label><?php esc_html_e('(EPR)', 'wiaas') ?></label>
</div>
<?php
}
@@ -121,7 +121,7 @@ $id = isset($customer_id) ? 'extras_customer_'.$customer_id : 'extras_default';
value="<?php esc_attr_e($cl_extras[$extra_type]['services'], 'wiaas') ?>"
type="text"
>
<label>(ESR)</label>
<label><?php esc_html_e('(ESR)', 'wiaas') ?></label>
</div>
</td>
<td>