Replace activity types and activity type categories models (#1556)

This PR adds the first step towards supporting custom activity types and custom activity type categories.
2018-07-14 08:25:31 -04:00
parent 23a84a9dfa
commit b4ec3d96ca
42 changed files with 1421 additions and 240 deletions
@@ -164,16 +164,17 @@ class ActivitiesController extends Controller
     * @param Activity $activity
     * @return \Illuminate\Http\Response
     */
-    public function destroy(Contact $contact, Activity $activity)
+    public function destroy(Activity $activity, Contact $contact)
    {
        $activity->deleteJournalEntry();

+        foreach ($activity->contacts as $contactActivity) {
+            $contactActivity->events()->forObject($activity)->get()->each->delete();
+            $contactActivity->calculateActivitiesStatistics();
+        }
+
        $activity->delete();

-        $contact->events()->forObject($activity)->get()->each->delete();
-
-        $contact->calculateActivitiesStatistics();
-
        return redirect('/people/'.$contact->hashID())
            ->with('success', trans('people.activities_delete_success'));
    }