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

update name to reflect logic behind margin

Browse Source
This commit is contained in:
Bilal Catic
2018-10-07 14:09:11 +02:00
parent ea63870704
commit ac9c89e8eb
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,7 +58,7 @@ class Wiaas_Admin_Package_Pricing {
$package = wc_get_product( $post->ID ); $package = wc_get_product( $post->ID );
$pricing_rules = Wiaas_Package_Pricing::get_package_prices($package); $pricing_rules = Wiaas_Package_Pricing::get_package_prices($package);
$commission = Wiaas_Package_Pricing::get_package_pricing_commission($package); $commission = Wiaas_Package_Pricing::get_package_pricing_commission($package);
$minimum_cost_margin = Wiaas_Package_Pricing::get_package_minimum_cost_margin($package); $max_cost_margin = Wiaas_Package_Pricing::get_package_max_cost_margin($package);
include 'views/html-package-pricing.php'; include 'views/html-package-pricing.php';
} }
@@ -73,7 +73,7 @@ class Wiaas_Admin_Package_Pricing {
wc_get_product( $post_id ), wc_get_product( $post_id ),
$_POST['wiaas_pricing_rules'], $_POST['wiaas_pricing_rules'],
$_POST['wiaas_pricing_rules_commision'], $_POST['wiaas_pricing_rules_commision'],
$_POST['wiaas_minimum_cost_margin']); $_POST['wiaas_max_cost_margin']);
} }
} }

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

@@ -148,10 +148,10 @@ if ( ! defined( 'ABSPATH' ) ) {
<?php <?php
woocommerce_wp_text_input( woocommerce_wp_text_input(
array( array(
'id' => '_wiaas_minimum_cost_margin', 'id' => '_wiaas_max_cost_margin',
'name' => 'wiaas_minimum_cost_margin', 'name' => 'wiaas_max_cost_margin',
'value' => $minimum_cost_margin, 'value' => $max_cost_margin,
'label' => __( 'Minimum cost margin:', 'wiaas' ), 'label' => __( 'Max cost margin:', 'wiaas' ),
'type' => 'number', 'type' => 'number',
) )
); );

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

@@ -101,8 +101,8 @@ class Wiaas_Package_Pricing {
return self::_get_package_pricing_commision($package); return self::_get_package_pricing_commision($package);
} }
public static function get_package_minimum_cost_margin($package){ public static function get_package_max_cost_margin($package){
return self::_get_package_minimum_cost_margin($package); return self::_get_package_max_cost_margin($package);
} }
/** /**
@@ -110,11 +110,11 @@ class Wiaas_Package_Pricing {
* @param $package * @param $package
* @param $pricing_rules * @param $pricing_rules
*/ */
public static function set_package_prices($package, $pricing_rules, $commision, $minimum_cost_margin) { public static function set_package_prices($package, $pricing_rules, $commision, $max_cost_margin) {
if ( isset( $pricing_rules ) ) { if ( isset( $pricing_rules ) ) {
$package->update_meta_data( '_wiaas_pricing_rules', $pricing_rules ); $package->update_meta_data( '_wiaas_pricing_rules', $pricing_rules );
$package->update_meta_data('_package_pricing_commision', $commision, true); $package->update_meta_data('_package_pricing_commision', $commision, true);
$package->update_meta_data('_package_minimum_cost_margin', $minimum_cost_margin, true); $package->update_meta_data('_package_max_cost_margin', $max_cost_margin, true);
} else { } else {
$package->delete_meta_data( '_wiaas_pricing_rules' ); $package->delete_meta_data( '_wiaas_pricing_rules' );
} }
@@ -160,14 +160,14 @@ class Wiaas_Package_Pricing {
return (float) $commision; return (float) $commision;
} }
private static function _get_package_minimum_cost_margin($package) { private static function _get_package_max_cost_margin($package) {
$minimum_cost_margin = $package->get_meta( '_package_minimum_cost_margin', true); $max_cost_margin = $package->get_meta( '_package_max_cost_margin', true);
if (!isset($minimum_cost_margin) || $minimum_cost_margin === '') { if (!isset($max_cost_margin) || $max_cost_margin === '') {
return 0; return 0;
} }
return (float) $minimum_cost_margin; return (float) $max_cost_margin;
} }
} }