diff --git a/modules/salesforce_mapping/src/Entity/MappedObject.php b/modules/salesforce_mapping/src/Entity/MappedObject.php index 139300041f1950915e01606cf327411f1ce3a4ed..ae9457cf1bd60e17427f0ccfc28ff486b23880d1 100644 --- a/modules/salesforce_mapping/src/Entity/MappedObject.php +++ b/modules/salesforce_mapping/src/Entity/MappedObject.php @@ -154,7 +154,7 @@ class MappedObject extends RevisionableContentEntityBase implements MappedObject return; } foreach ($vids_to_delete as $vid => $dummy) { - $storage->deleteRevision($vid); + $storage->deleteRevision($vid); } return $this; } @@ -497,9 +497,7 @@ class MappedObject extends RevisionableContentEntityBase implements MappedObject } /** - * Get the mapped Salesforce record. - * - * @return \Drupal\salesforce\SObject + * {@inheritdoc} */ public function getSalesforceRecord() { return $this->sf_object; diff --git a/modules/salesforce_mapping/src/Entity/MappedObjectInterface.php b/modules/salesforce_mapping/src/Entity/MappedObjectInterface.php index 4fbe3be84ecc5e34fde3093d63e8ea1535bc92eb..79cbec9b615af9bddce409721502effbbd3325be 100644 --- a/modules/salesforce_mapping/src/Entity/MappedObjectInterface.php +++ b/modules/salesforce_mapping/src/Entity/MappedObjectInterface.php @@ -52,6 +52,13 @@ interface MappedObjectInterface extends EntityChangedInterface, RevisionLogInter public function getSalesforceUrl(); /** + * Get the mapped Salesforce record. + * + * @return \Drupal\salesforce\SObject + */ + public function getSalesforceRecord(); + + /** * @return string * SFID */ diff --git a/modules/salesforce_mapping/src/Entity/SalesforceMapping.php b/modules/salesforce_mapping/src/Entity/SalesforceMapping.php index 3b2e9c7c893fbe1b1fd61f5a8bda0b324805216c..ec093dea03fa23069f7665c7b5a80bd93949868f 100644 --- a/modules/salesforce_mapping/src/Entity/SalesforceMapping.php +++ b/modules/salesforce_mapping/src/Entity/SalesforceMapping.php @@ -601,6 +601,7 @@ class SalesforceMapping extends ConfigEntityBase implements SalesforceMappingInt if (!empty($this->pull_where_clause)) { $soql->conditions[] = [$this->pull_where_clause]; } + $soql->order[$this->getPullTriggerDate()] = 'ASC'; return $soql; } diff --git a/modules/salesforce_mapping/src/Event/SalesforceQueryEvent.php b/modules/salesforce_mapping/src/Event/SalesforceQueryEvent.php index 0e0f4df941542e4cdd5ec1127b2258a5009265e3..1a90635da249065380e61cae6cac82be694682d8 100644 --- a/modules/salesforce_mapping/src/Event/SalesforceQueryEvent.php +++ b/modules/salesforce_mapping/src/Event/SalesforceQueryEvent.php @@ -26,7 +26,7 @@ class SalesforceQueryEvent extends SalesforceBaseEvent { } /** - * @return EntityInterface (from PushParams) + * @return SelectQuery */ public function getQuery() { return $this->query;