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

Backoffice - max cost margin #31

Merged
bilal.catic merged 22 commits from backoffice-max-cost-margin into master 2018-10-15 00:24:34 +02:00
Conversation 23 Commits 22 Files Changed 11 +8 -4
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e4a7b28301 - Show all commits

3
backend/app/plugins/wiaas/tests/unit-tests/pricing/test-wiaas-package-pricing.php
View File

@@ -29,8 +29,9 @@ class Wiaas_Package_Pricing_Test extends Wiaas_Unit_Test_Case {
);
$commision = 60;
$cost_margin = 0;
Wiaas_Package_Pricing::set_package_prices($package, $pricing_rules, $commision);
Wiaas_Package_Pricing::set_package_prices($package, $pricing_rules, $commision, $cost_margin);
$configured_prices = Wiaas_Package_Pricing::get_package_prices($package);

9
backend/app/plugins/wiaas/tests/unit-tests/test-wiaas-pricing.php
View File

@@ -31,7 +31,8 @@ class Wiaas_Pricing_Test extends Wiaas_Unit_Test_Case {
)
);
$commision = 50;
Wiaas_Package_Pricing::set_package_prices($package, $pricing_rules, $commision);
$cost_margin = 0;
Wiaas_Package_Pricing::set_package_prices($package, $pricing_rules, $commision, $cost_margin);
$expected_prices = array(
'purchase' => array(
@@ -229,7 +230,8 @@ class Wiaas_Pricing_Test extends Wiaas_Unit_Test_Case {
)
);
$commision = 50;
Wiaas_Package_Pricing::set_package_prices($addon_package, $pricing_rules, $commision);
$cost_margin = 0;
Wiaas_Package_Pricing::set_package_prices($addon_package, $pricing_rules, $commision, $cost_margin);
Wiaas_Package_Addon::set_package_addons($package, array($addon_package->get_id()));
@@ -306,7 +308,8 @@ class Wiaas_Pricing_Test extends Wiaas_Unit_Test_Case {
)
);
$commision = 50;
Wiaas_Package_Pricing::set_package_prices($option_package, $pricing_rules, $commision);
$cost_margin = 0;
Wiaas_Package_Pricing::set_package_prices($option_package, $pricing_rules, $commision, $cost_margin);
Wiaas_Package_Option_Groups::set_package_option_groups($package, array(
'id' => 'option',