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

Merge branch 'master' into package-reference

Browse Source
This commit is contained in:
Almira Krdzic
2018-10-19 21:01:05 +02:00
parent 038b622eca 9b5cc3a978
commit 5a6f876c69
2 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,9 +11,8 @@ class Wiaas_Admin_Package {
require_once dirname( __FILE__ ) . '/package/class-wiaas-admin-linked-packages.php';
require_once dirname( __FILE__ ) . '/package/class-wiaas-admin-package-types.php';
add_action( 'woocommerce_product_data_tabs', array( __CLASS__, 'package_data_tabs' ), 1 );
add_action( 'manage_product_posts_columns', array( __CLASS__, 'manage_list_table_products_columns' ), 999, 2 );
add_action( 'woocommerce_product_data_tabs', array( __CLASS__, 'package_data_tabs' ), 999);
}
/**
@@ -31,6 +30,7 @@ class Wiaas_Admin_Package {
unset($tabs['variations']);
unset($tabs['advanced']);
unset($tabs['shipping']);
unset($tabs['inventory']);
return $tabs;
}

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

@@ -21,24 +21,10 @@ class Wiaas_Admin_Package_Pricing {
}
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();
}
}
$edit_link = admin_url( 'edit.php?post_type=product&page=wiaas-package_price_editor&id=' . absint( $package->get_id() ) );
$price_html = 'Fixed: ' . $price_html . ' and ' . $recurring_price . ' / month' .
' <br> <a class="button button-link" href="' . esc_url($edit_link) .'" target="_blank">Edit price<a>';
return $price_html;
return '<a class="button button-link" href="' . esc_url($edit_link) .'" target="_blank">Edit price<a>';
}
public static function render_edit_prices_link() {