Version 5.0.13

applications/nexus/extensions/core/AchievementAction/Package.php

@@ -48,7 +48,7 @@ class Package extends AchievementActionAbstract // NOTE: Other classes exist to
 	 */
 	public function filters( ?array $filters, Url $url ): array
 	{
-		$return	= array();
+		$return	= parent::filters( $filters, $url );
 
 		$return['nodes'] = new Node( 'achievement_filter_Package', ( $filters and isset( $filters['nodes'] ) and $filters['nodes'] ) ? $filters['nodes'] : 0, FALSE, [
 			'url'				=> $url,
@@ -75,7 +75,7 @@ class Package extends AchievementActionAbstract // NOTE: Other classes exist to
 	 */
 	public function formatFilterValues( array $values ): array
 	{
-		$return = [];
+		$return = parent::formatFilterValues( $values );
 		if ( isset( $values['achievement_filter_Package'] ) )
 		{
 			$return['nodes'] = [];
@@ -128,6 +128,38 @@ class Package extends AchievementActionAbstract // NOTE: Other classes exist to
 		return TRUE;
 	}
 
+	/**
+	 * Determines if the member has already completed this rule.
+	 * Used for retroactive rule completion.
+	 * So far, this is only used in Quests, but may be used elsewhere at a later point.
+	 *
+	 * @param Member $member
+	 * @param array $filters
+	 * @return bool
+	 */
+	public function isRuleCompleted( Member $member, array $filters ) : bool
+	{
+		$where = [
+			[ 'ps_member=?', $member->member_id ]
+		];
+
+		iF( !empty( $filters['nodes'] ) )
+		{
+			$where[] = [ Db::i()->in( 'p_group', $filters['nodes'] ) ];
+		}
+
+		$total = Db::i()->select( 'count(*)', 'nexus_purchases', $where )
+			->join( 'nexus_packages', [ 'ps_app=? and ps_type=? ps_item_id=p_id', 'nexus', 'package' ] )
+			->first();
+
+		if( !empty( $filters['milestone'] ) )
+		{
+			return $total >= $filters['milestone'];
+		}
+
+		return $total > 0;
+	}
+
 	/**
 	 * Get identifier to prevent the member being awarded points for the same action twice
 	 * Must be unique within within of this domain, must not exceed 32 chars.
@@ -179,7 +211,7 @@ class Package extends AchievementActionAbstract // NOTE: Other classes exist to
 		{
 			$conditions[] = Member::loggedIn()->language()->addToStack( 'achievements_title_filter_milestone', FALSE, [
 				'htmlsprintf' => [
-					Theme::i()->getTemplate( 'achievements' )->ruleDescriptionBadge( 'milestone', Member::loggedIn()->language()->addToStack( 'achievements_title_filter_milestone_nth', FALSE, [ 'pluralize' => [ $rule->filters['milestone'] ] ] ) )
+					Theme::i()->getTemplate( 'achievements', 'core' )->ruleDescriptionBadge( 'milestone', Member::loggedIn()->language()->addToStack( 'achievements_title_filter_milestone_nth', FALSE, [ 'pluralize' => [ $rule->filters['milestone'] ] ] ) )
 				],
 				'sprintf'		=> [ Member::loggedIn()->language()->addToStack('AchievementAction__Package_title_generic') ]
 			] );
@@ -190,7 +222,12 @@ class Package extends AchievementActionAbstract // NOTE: Other classes exist to
 			$conditions[] = $nodeCondition;
 		}
 
-		return Theme::i()->getTemplate( 'achievements' )->ruleDescription(
+		if( $questCondition = $this->_questFilterDescription( $rule ) )
+		{
+			$conditions[] = $questCondition;
+		}
+
+		return Theme::i()->getTemplate( 'achievements', 'core' )->ruleDescription(
 			Member::loggedIn()->language()->addToStack( 'AchievementAction__Package_title' ),
 			$conditions
 		);
@@ -219,7 +256,7 @@ class Package extends AchievementActionAbstract // NOTE: Other classes exist to
 			{
 				return Member::loggedIn()->language()->addToStack( 'achievements_title_filter_location', FALSE, [
 					'htmlsprintf' => [
-						Theme::i()->getTemplate( 'achievements' )->ruleDescriptionBadge( 'location',
+						Theme::i()->getTemplate( 'achievements', 'core' )->ruleDescriptionBadge( 'location',
 							count( $nodeNames ) === 1 ? $nodeNames[0] : Member::loggedIn()->language()->addToStack( 'achievements_title_filter_location_val', FALSE, [ 'sprintf' => [
 								count( $nodeNames ),
 								Member::loggedIn()->language()->addToStack( 'purchase_groups_lc', FALSE )