Kolab Groupware OBS

kolab-hkccp.spec Changed

kolab-hkccp-0.7.17.tar.gz/composer.phar -> kolab-hkccp-0.7.18.tar.gz/composer.phar Changed

kolab-hkccp-0.7.17.tar.gz/config/config.ini.sample -> kolab-hkccp-0.7.18.tar.gz/config/config.ini.sample Changed

kolab-hkccp-0.7.17.tar.gz/lib/Kolab/Hosted/Controller/SignupController.php -> kolab-hkccp-0.7.18.tar.gz/lib/Kolab/Hosted/Controller/SignupController.php Changed

@@ -186,6 +186,7 @@
             exit;
         }
 
+        $site_discount = round(floatval($this->config->get('site.discount')) / 100, 3);
         $account_types = array_filter((array)$this->config->get('accounttype'), function($val){ return Config::boolean($val['signup']); });
 
         if (count($this->route) > 1){
@@ -355,9 +356,13 @@
                     // handle account attributes
                     $attributes = Utils::array_filter_keys($attributes, array_keys($this->config->get('attribute', array())));
 
+                    // set site discount to the configured value
+                    if (!empty($site_discount)) {
+                        $attributes['discount'] += $site_discount;
+                    }
                     // set discount to the configured value for this account type
                     if (!empty($account_prop['discount'])) {
-                        $attributes['discount'] = floatval($account_prop['discount']);
+                        $attributes['discount'] += floatval($account_prop['discount']);
                     }
 
                     // store the selected subscription plan
@@ -505,6 +510,7 @@
         $this->output->set('captcha', $captcha ? $captcha->html() : '');
         $this->output->set_env('storage', array_map('floatval', $this->config->get('storage')));
         $this->output->set_env('options', $jsoptions);
+        $this->output->set_env('discount', $site_discount);
         $this->output->set_env('accounttype', $account_type);
         $this->output->set_env('subscriptionplans', array_map(function($plan) {
             return array('factor' => intval($plan['factor'])); }, $subscriptionplans));

Changes of Revision 3