A new approach to deal with $defaultcostcenter. Working (#86)

- If item(s) do not have costcenter defined, chain of costcenters will be: "nocostcenter" -> default costcenter (if set) - If item(s) have costcenter defined, chain of costcenters will be: "nocostcenter" -> given costcenter
Wunderbyte-GmbH · Nov 6, 2024 · aa81afe · aa81afe
1 parent 87e6e19
commit aa81afe
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/classes/local/cartstore.php b/classes/local/cartstore.php
@@ -97,7 +97,9 @@ public function add_item(cartitem $item) {
         $data['items'][$cacheitemkey] = $itemdata;
         $data['expirationtime'] = $expirationtime;
 
-        $data['costcenter'] = !empty($item->costcenter) ? $item->costcenter : ($data['costcenter'] ?? '');
+        // Use ot item ot default costcenter.
+        $defaultcostcenter = get_config('local_shopping_cart', 'defaultcostcenterforcredits');
+        $data['costcenter'] = !empty($item->costcenter) ? $item->costcenter : ($defaultcostcenter ?? '');
 
         // When we add the first item, we need to reset credit...
         // ... because we can only use the one from the correct cost center.
@@ -601,14 +603,16 @@ public function same_costcenter(string $currentcostcenter) {
      */
     public function get_costcenter(): string {
         $costcenterincart = '';
+        $defaultcostcenter = get_config('local_shopping_cart', 'defaultcostcenterforcredits');
 
         $items = $this->get_items();
         foreach ($items as $itemincart) {
             if ($itemincart['area'] == 'bookingfee' || $itemincart['area'] == 'rebookingcredit') {
                 // We only need to check for "real" items, booking fee does not apply.
                 continue;
             } else {
-                $costcenterincart = $itemincart['costcenter'] ?? '';
+                // Use ot item ot default costcenter.
+                $costcenterincart = !empty($itemincart['costcenter']) ? $itemincart['costcenter'] : ($defaultcostcenter ?? '');
                 break;
             }
         }

diff --git a/classes/shopping_cart_credits.php b/classes/shopping_cart_credits.php
@@ -67,11 +67,18 @@ public static function get_balance(int $userid, string $costcenter = '', $withem
         ];
         $additionalsql = " COALESCE(NULLIF(costcenter, ''), '') = :costcenter ";
         $params['costcenter'] = $costcenter;
-        $defaultcostcenter = get_config('local_shopping_cart', 'defaultcostcenterforcredits');
+
+        $defaultcostcentersql = '';
+
         if ($withempty) {
-            $defaultcostcentersql = " OR COALESCE(NULLIF(costcenter, ''), '') = '' ";
-        } else {
-            $defaultcostcentersql = '';
+            // Get balance for costcenter without name ("no costcenter").
+            $defaultcostcentersql .= " OR COALESCE(NULLIF(costcenter, ''), '') = '' ";
+            // Inclide balance for default costcenter if costcenter not provided explicitly.
+            $defaultcostcenter = get_config('local_shopping_cart', 'defaultcostcenterforcredits');
+            if (!empty($defaultcostcenter) && $defaultcostcenter == $costcenter) {
+                $defaultcostcentersql = " OR COALESCE(NULLIF(costcenter, ''), '') = :defaultcostcenter ";
+                $params['defaultcostcenter'] = $defaultcostcenter;
+            }
         }
 
         $sql = 'SELECT SUM(balance) AS balance, MAX(currency) as currency