Migrate merchants models to the new app

City-of-Helsinki · Sep 18, 2024 · c9c2df3 · c9c2df3
1 parent 2653812
commit c9c2df3
Show file tree

Hide file tree

Showing 124 changed files with 1,474 additions and 896 deletions.
diff --git a/common/management/commands/data_creation/create_caisa.py b/common/management/commands/data_creation/create_caisa.py
@@ -1,6 +1,5 @@
 from datetime import date, timedelta
 
-from merchants.models import PaymentAccounting, PaymentMerchant, PaymentProduct
 from opening_hours.models import OriginHaukiResource
 from reservation_units.enums import (
     AuthenticationType,
@@ -24,7 +23,7 @@
 from reservations.models import ReservationMetadataSet
 from spaces.models import Space, Unit
 from tilavarauspalvelu.enums import TermsOfUseTypeChoices
-from tilavarauspalvelu.models import TermsOfUse
+from tilavarauspalvelu.models import PaymentAccounting, PaymentMerchant, PaymentProduct, TermsOfUse
 
 from .utils import SetName, with_logs
 

diff --git a/config/urls.py b/config/urls.py
@@ -41,7 +41,7 @@
 ]
 
 if settings.MOCK_VERKKOKAUPPA_API_ENABLED:
-    urlpatterns.append(path("mock_verkkokauppa/", include("merchants.mock_verkkokauppa_api.urls")))
+    urlpatterns.append(path("mock_verkkokauppa/", include("tilavarauspalvelu.api.mock_verkkokauppa_api.urls")))
 
 if settings.DEBUG:
     urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

diff --git a/merchants/admin/__init__.py b/merchants/admin/__init__.py
diff --git a/merchants/admin/payment_accounting.py b/merchants/admin/payment_accounting.py
diff --git a/merchants/admin/payment_merchant.py b/merchants/admin/payment_merchant.py
diff --git a/merchants/admin/payment_order.py b/merchants/admin/payment_order.py
diff --git a/merchants/apps.py b/merchants/apps.py
diff --git a/merchants/enums.py b/merchants/enums.py