Merge branch 'main' of http://10.10.1.136:3000/ismail/haikal

inventory/urls.py

@@ -53,6 +53,11 @@ urlpatterns = [
     path("submit_plan/", views.submit_plan, name="submit_plan"),
     path('payment-callback/', views.payment_callback, name='payment_callback'),
     #
+    path(
+        "dealers/activity/",
+        views.UserActivityLogListView.as_view(),
+        name="dealer_activity",
+    ),
     path("dealers/<slug:slug>/settings/", views.DealerSettingsView, name="dealer_settings"),
     path("dealers/assign-car-makes/", views.assign_car_makes, name="assign_car_makes"),
     path("dashboards/manager/", views.ManagerDashboard.as_view(), name="manager_dashboard"),
@@ -67,11 +72,6 @@ urlpatterns = [
         views.DealerUpdateView.as_view(),
         name="dealer_update",
     ),
-    path(
-        "dealers/activity/",
-        views.UserActivityLogListView.as_view(),
-        name="dealer_activity",
-    ),
     # path('dealers/<int:pk>/delete/', views.DealerDeleteView.as_view(), name='dealer_delete'),
     # CRM URLs
     path(

inventory/views.py

@@ -5194,6 +5194,12 @@ class OpportunityCreateView(CreateView,SuccessMessageMixin, LoginRequiredMixin):
         dealer = get_user_type(self.request)
         return context
 
+    def get_form_kwargs(self):
+        kwargs = super().get_form_kwargs()
+        dealer = get_user_type(self.request)
+        kwargs["car"].queryset = models.Car.objects.filter(dealer=dealer,)
+        return kwargs
+
     # def get_initial(self):
     #     initial = super().get_initial()
     #     if self.kwargs.get("pk", None):