diff --git a/backend/core/settings/unfold_conf.py b/backend/core/settings/unfold_conf.py index 99ea771..eb8f419 100644 --- a/backend/core/settings/unfold_conf.py +++ b/backend/core/settings/unfold_conf.py @@ -104,12 +104,6 @@ UNFOLD = { "link": reverse_lazy("admin:home_learnvideomodel_changelist"), "badge": "utils.admin.new_learn_video_count", }, - { - "title": _("سفارشات"), - "icon": "shopping_cart", - "link": reverse_lazy("admin:order_ordermodel_changelist"), - "badge": "utils.admin.admin_pending_count", - }, { "title": _("فروشگاه ها"), "icon": "storefront", @@ -120,6 +114,34 @@ UNFOLD = { + { + "title": _("محصولات سفارشات"), + "separator": True, + "collapsible": False, + "items": [ + { + "title": _("سفارشات"), + "icon": "shopping_cart", + "link": reverse_lazy("admin:order_ordermodel_changelist"), + # "badge": "utils.admin.admin_pending_count", + }, + { + "title": _("سفارشات فروشگاه"), + "icon": "shopping_cart", + "link": reverse_lazy("admin:order_shopordermodel_changelist"), + # "badge": "utils.admin.admin_pending_count", + }, + { + "title": _("گزارش فروش فروشگاه ها"), + "icon": "shopping_cart", + "link": reverse_lazy("admin:order_shopdailyreport_changelist"), + # "badge": "utils.admin.admin_pending_count", + }, + + ], + }, + + { "title": _("محصولات فروشگاه"), "separator": True, @@ -157,7 +179,7 @@ UNFOLD = { { "title": _("سکشن دسته بندی"), "separator": True, - "collapsible": False, + "collapsible": True, "items": [ { diff --git a/backend/order/admin.py b/backend/order/admin.py index b091b7b..f4a76d9 100644 --- a/backend/order/admin.py +++ b/backend/order/admin.py @@ -58,7 +58,25 @@ class CartAdmin(ModelAdmin): inlines = [CartItemInline] +from .models import ShopDailyReport, ShopOrderModel +@admin.register(ShopDailyReport) +class ShopDailyReportAdmin(ModelAdmin): + pass +class ShopOrderItemInline(StackedInline): + model = ShopOrderItem + extra = 0 + max_num = 0 + tab = True + + + + + + +@admin.register(ShopOrderModel) +class ShopOrderModelAdmin(ModelAdmin): + inlines = [ShopOrderItemInline] @admin.register(OrderModel) class OrderAdmin(ModelAdmin, ImportExportModelAdmin): @@ -115,4 +133,7 @@ class OrderAdmin(ModelAdmin, ImportExportModelAdmin): if bank_record.is_success: logging.debug("This record is verify now.", extra={"pk": bank_record.pk}) messages.success(request, f"با موفقیت اپدیت شد") - return redirect("admin:order_ordermodel_changelist") \ No newline at end of file + return redirect("admin:order_ordermodel_changelist") + + + diff --git a/backend/order/views.py b/backend/order/views.py index 4fcd28c..756baaf 100644 --- a/backend/order/views.py +++ b/backend/order/views.py @@ -376,7 +376,7 @@ class PaymentView(APIView): # Use final_price instead of hardcoded amount bank.set_amount(cart.final_price) bank.set_client_callback_url( - 'http://localhost:3000/transaction') + 'https://heymlz.com/transaction') bank.set_mobile_number(user_mobile_number) bank_record = bank.ready()