Merge Dev Branch

CRM/Civicase/Hook/BuildForm/AddQuotationsNotesToContributionSettings.php

@@ -49,11 +49,13 @@ public function addQuotationsNoteField(CRM_Core_Form &$form) {
         'weight' => 5,
         'description' => ts('Enter note or message to be displyaed on quotations'),
         'attributes' => ['rows' => 2, 'cols' => 40],
+        'name' => $fieldName,
+        'quick_form_type' => 'Element',
       ],
     ];
 
     $form->add('wysiwyg', $fieldName, $field[$fieldName]['title'], $field[$fieldName]['attributes']);
-    $form->assign('htmlFields', array_merge($form->get_template_vars('htmlFields'), $field));
+    $form->assign('fields', array_values(array_merge($form->getTemplateVars('fields'), $field)));
     $value = Civi::settings()->get($fieldName) ?? NULL;
     $form->setDefaults(array_merge($form->_defaultValues, [$fieldName => $value]));
 

CRM/Civicase/Hook/BuildForm/AddSalesOrderLineItemsToContribution.php

@@ -1,5 +1,8 @@
 <?php
 
+use Civi\Api4\PriceField;
+use Civi\Api4\PriceFieldValue;
+use Civi\Api4\PriceSet;
 use CRM_Civicase_ExtensionUtil as E;
 use CRM_Civicase_Service_CaseSalesOrderLineItemsGenerator as salesOrderlineItemGenerator;
 
@@ -27,6 +30,14 @@ public function run(CRM_Core_Form &$form, $formName) {
     }
     $lineItemGenerator = new salesOrderlineItemGenerator($salesOrderId, $toBeInvoiced, $percentValue);
     $lineItems = $lineItemGenerator->generateLineItems();
+    $priceField = $this->getDefaultPriceSetFields();
+    \Civi::cache('short')->set('sales_order_line_items', $lineItems);
+
+    $submittedValues = [];
+    foreach ($lineItems as $index => &$lineItem) {
+      $submittedValues[] = $priceField[$index]['id'];
+    }
+    $form->assign('lineItemSubmitted', json_encode($submittedValues));
 
     CRM_Core_Resources::singleton()
       ->addScriptFile(E::LONG_NAME, 'js/sales-order-contribution.js')
@@ -61,4 +72,25 @@ public function shouldRun(CRM_Core_Form $form, string $formName, ?int $salesOrde
       && !empty($salesOrderId);
   }
 
+  /**
+   * Returns default contribution price set fields.
+   *
+   * @return array
+   *   Array of price fields
+   */
+  private function getDefaultPriceSetFields(): array {
+    $priceSet = PriceSet::get(FALSE)
+      ->addWhere('name', '=', 'default_contribution_amount')
+      ->addWhere('is_quick_config', '=', 1)
+      ->execute()
+      ->first();
+
+    return PriceField::get(FALSE)
+      ->addWhere('price_set_id', '=', $priceSet['id'])
+      ->addChain('price_field_value', PriceFieldValue::get(FALSE)
+        ->addWhere('price_field_id', '=', '$id')
+      )->execute()
+      ->getArrayCopy();
+  }
+
 }

CRM/Civicase/Hook/BuildForm/AddStyleFieldToCaseCustomGroups.php

@@ -28,15 +28,17 @@ public function run($form, $formName) {
       return;
     }
 
-    $contactTypes = json_decode($form->get_template_vars('contactTypes'));
+    $multipleTypes = $form->get_template_vars('allowMultiple');
     $caseEntityNames = CaseType::buildOptions('case_type_category', 'validate');
 
     // This is the generic entity for all cases.
     $caseEntityNames[] = 'Case';
 
-    $contactTypes = array_merge($contactTypes, $caseEntityNames);
+    foreach ($caseEntityNames as $caseEntityName) {
+      $multipleTypes[$caseEntityName] = TRUE;
+    }
 
-    $form->assign('contactTypes', json_encode($contactTypes));
+    $form->assign('allowMultiple', $multipleTypes);
     CRM_Core_Resources::singleton()->addSetting([
       'caseEntityNames' => $caseEntityNames,
     ]);

CRM/Civicase/Hook/PageRun/AddCaseTypeCategoryToCache.php

@@ -0,0 +1,33 @@
+<?php
+
+use CRM_Civicase_Helper_CaseUrl as CaseUrlHelper;
+
+/**
+ * Add case type category to cache.
+ */
+class CRM_Civicase_Hook_PageRun_AddCaseTypeCategoryToCache {
+
+  /**
+   * Add case type category to cache.
+   *
+   * @param object $page
+   *   Page Object.
+   */
+  public function run(&$page): void {
+    $this->addCaseTypeCategoryToCache();
+  }
+
+  /**
+   * Add case type category to cache.
+   */
+  private function addCaseTypeCategoryToCache(): void {
+    if (CRM_Utils_System::currentPath() === 'civicrm/case/a') {
+      $caseCategoryInfo = CaseUrlHelper::getCategoryParamsFromUrl();
+      \Civi::cache('metadata')->set('current_case_category', $caseCategoryInfo[1]);
+    }
+    elseif (!in_array(CRM_Utils_System::currentPath(), ['civicrm/asset/builder', 'civicrm/user-menu'], TRUE)) {
+      \Civi::cache('metadata')->set('current_case_category', NULL);
+    }
+  }
+
+}

CRM/Civicase/Hook/alterContent/AddSalesOrderLineToContribution.php

@@ -0,0 +1,125 @@
+<?php
+
+/**
+ * Adds sales order line items to the contribution.
+ */
+class CRM_Civicase_Hook_alterContent_AddSalesOrderLineToContribution {
+
+  /**
+   * Stores the sales order line items retrieved from the cache.
+   *
+   * @var array
+   */
+  private $salesOrderLineItems;
+
+  /**
+   * Constructs the AddSalesOrderLindeToContribution class.
+   *
+   * @param string $content
+   *   The content to be altered.
+   * @param array $context
+   *   The context for the hook.
+   * @param string $tplName
+   *   The name of the template.
+   */
+  public function __construct(private &$content, private $context, private $tplName) {
+    $this->salesOrderLineItems = \Civi::cache('short')->get('sales_order_line_items');
+  }
+
+  /**
+   * Add sales order line items to the contribution.
+   */
+  public function run() {
+    if (!$this->shouldRun()) {
+      return;
+    }
+
+    $this->addLineItems();
+  }
+
+  /**
+   * Adds sales order line items to the contribution.
+   *
+   * This method retrieves the sales order line items from the cache, and then
+   * updates the corresponding input fields in the contribution
+   * page's HTML content.
+   */
+  public function addLineItems() {
+    $dom = new DomDocument();
+    $dom->loadHTML($this->content);
+
+    $table = $dom->getElementById('info');
+
+    // Delete the first row (index 0)
+    if ($table) {
+      $firstRow = $table->getElementsByTagName('tr')->item(0);
+      if ($firstRow) {
+        $table->removeChild($firstRow);
+      }
+    }
+
+    $rows = $table->getElementsByTagName('tr');
+    // Set the values in the DOM.
+    foreach ($this->salesOrderLineItems as $index => $item) {
+      if ($index < $rows->length) {
+        // Get the current row.
+        $row = $rows->item($index);
+
+        // Remove 'hiddenElement' class if it exists.
+        $row->setAttribute('class', str_replace('hiddenElement', '', $row->getAttribute('class')));
+
+        // Set the values from the line item array.
+        $inputs = $row->getElementsByTagName('input');
+        $selects = $row->getElementsByTagName('select');
+
+        foreach ($inputs as $input) {
+          $name = $input->getAttribute('name');
+
+          if (strpos($name, 'qty') !== FALSE) {
+            $input->setAttribute('value', $item['qty']);
+          }
+          elseif (strpos($name, 'tax_amount') !== FALSE) {
+            $input->setAttribute('value', $item['tax_amount']);
+          }
+          elseif (strpos($name, 'line_total') !== FALSE) {
+            $input->setAttribute('value', $item['line_total']);
+          }
+          elseif (strpos($name, 'unit_price') !== FALSE) {
+            $input->setAttribute('value', $item['unit_price']);
+          }
+          elseif (strpos($name, 'label') !== FALSE) {
+            $input->setAttribute('value', $item['label']);
+          }
+        }
+
+        foreach ($selects as $select) {
+          $name = $select->getAttribute('name');
+
+          if (strpos($name, 'financial_type_id') !== FALSE) {
+            foreach ($select->getElementsByTagName('option') as $option) {
+              if ($option->getAttribute('value') == $item['financial_type_id']) {
+                $option->setAttribute('selected', 'selected');
+                break;
+              }
+            }
+          }
+        }
+      }
+    }
+
+    \Civi::cache('short')->delete('sales_order_line_items');
+
+    $this->content = $dom->saveHTML();
+  }
+
+  /**
+   * Determines whether the hook should run.
+   *
+   * @return bool
+   *   TRUE if the hook should run, FALSE otherwise.
+   */
+  public function shouldRun() {
+    return $this->tplName === "CRM/Contribute/Page/Tab.tpl" && $this->context == "page" && !empty($this->salesOrderLineItems);
+  }
+
+}

CRM/Civicase/Service/CaseSalesOrderLineItemsGenerator.php

@@ -147,7 +147,7 @@ private function lineItemToContributionLineItem(array $item) {
       'entity_table' => 'civicrm_contribution',
       'financial_type_id' => $item['financial_type_id'],
       'line_total' => round($item['total'], 2),
-      'unit_price' => round($item['unit_price'], 2),
+      'unit_price' => $item['unit_price'],
     ];
   }
 

CRM/Civicase/Upgrader/Steps/Step0020.php

@@ -0,0 +1,32 @@
+<?php
+
+use CRM_Civicase_Setup_Manage_QuotationTemplateManager as QuotationTemplateManager;
+
+/**
+ * Update sales order invoice message template.
+ */
+class CRM_Civicase_Upgrader_Steps_Step0020 {
+
+  /**
+   * Runs the upgrader changes.
+   *
+   * @return bool
+   *   Return value in boolean.
+   */
+  public function apply(): bool {
+    try {
+      (new QuotationTemplateManager())->create();
+    }
+    catch (\Throwable $th) {
+      \Civi::log()->error('Error upgrading Civicase', [
+        'context' => [
+          'backtrace' => $th->getTraceAsString(),
+          'message' => $th->getMessage(),
+        ],
+      ]);
+    }
+
+    return TRUE;
+  }
+
+}

CRM/Civicase/XMLProcessor/Report.php

@@ -67,6 +67,7 @@ public static function getCaseReport($clientID, $caseID, $activitySetName, $para
     $template->assign('caseId', $caseID);
     $template->assign('clientID', $clientID);
     $template->assign('activitySetName', $activitySetName);
+    $allActivityTypes = CRM_Case_PseudoConstant::caseActivityType();
 
     if (!empty($params['is_redact'])) {
       $report->_isRedact = TRUE;
@@ -96,10 +97,10 @@ public static function getCaseReport($clientID, $caseID, $activitySetName, $para
 
     if ($activitySetName && !empty($activitySetNames[$activitySetName])) {
       $timelineActivities = $report->getActivityTypes($xml, $activitySetName);
-      $activityTypes = !empty($timelineActivities) ? $timelineActivities : CRM_Case_XMLProcessor::allActivityTypes();
+      $activityTypes = !empty($timelineActivities) ? $timelineActivities : $allActivityTypes;
     }
     else {
-      $activityTypes = CRM_Case_XMLProcessor::allActivityTypes();
+      $activityTypes = $allActivityTypes;
     }
 
     if (!$activityTypes) {

ang/civicase-base.ang.php

@@ -9,11 +9,11 @@
  */
 
 use Civi\CCase\Utils as Utils;
-use CRM_Civicase_Helper_OptionValues as OptionValuesHelper;
+use CRM_Civicase_Helper_CaseUrl as CaseUrlHelper;
 use CRM_Civicase_Helper_GlobRecursive as GlobRecursive;
 use CRM_Civicase_Helper_NewCaseWebform as NewCaseWebform;
+use CRM_Civicase_Helper_OptionValues as OptionValuesHelper;
 use CRM_Civicase_Service_CaseCategoryCustomFieldsSetting as CaseCategoryCustomFieldsSetting;
-use CRM_Civicase_Helper_CaseUrl as CaseUrlHelper;
 
 [$caseCategoryId, $caseCategoryName] = CaseUrlHelper::getCategoryParamsFromUrl();
 
@@ -110,7 +110,7 @@ function expose_settings(array &$options, array $defaults) {
 function get_base_js_files() {
   return array_merge(
     [
-      'assetBuilder://visual-bundle.js',
+      Civi::service('asset_builder')->getUrl('visual-bundle.js'),
       'ang/civicase-base.js',
     ],
     GlobRecursive::getRelativeToExtension(

ang/civicase-features/quotations/directives/quotations-list.directive.html

@@ -14,7 +14,7 @@ <h1 ng-if="view !== 'contact'" crm-page-title>{{ ts('Manage Quotations') }}</h1>
         <afsearch-contact-quotations options="{contact_id: contactId}" ng-switch-when="contact"> </afsearch-contact-quotations>
         <afsearch-quotations ng-switch-default> </afsearch-quotations>
       </div>
-      
+
     </div>
   </div>
 </div>
@@ -35,7 +35,6 @@ <h1 ng-if="view !== 'contact'" crm-page-title>{{ ts('Manage Quotations') }}</h1>
     margin: 0em 1em;
   }
   #bootstrap-theme.civicase__container .quotation__list ul.dropdown-menu {
-    right: 0;
     left: auto;
   }
 </style>