¨4.0.1¨

2023-12-03 14:07:47 +00:00
parent c08b36d1b6
commit f35052522d
1112 changed files with 43019 additions and 24987 deletions
--- a/Modules/Report/Resources/assets/admin/sass/main.scss
+++ b/Modules/Report/Resources/assets/admin/sass/main.scss
@@ -0,0 +1,59 @@
+.report-wrapper {
+    background: transparent;
+    box-shadow: none;
+
+    .box-body {
+        margin-left: -15px;
+        margin-right: -15px;
+    }
+}
+
+.report-result {
+    padding: 15px 15px 10px;
+    background: #ffffff;
+    border-radius: 3px;
+    box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
+
+    .table-responsive {
+        margin-bottom: 0;
+    }
+
+    .table {
+        margin-top: 15px;
+        margin-bottom: 0;
+
+        td {
+            padding: 15px;
+            border: none;
+
+            &.empty {
+                text-align: center;
+            }
+
+            a {
+                color: #333;
+            }
+        }
+    }
+}
+
+.filter-report {
+    padding: 15px;
+    background: #ffffff;
+    border-radius: 3px;
+    box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
+
+    form {
+        margin-top: 15px;
+    }
+
+    .form-group select {
+        width: 100%;
+    }
+}
+
+@media screen and (max-width: 991px) {
+    .filter-report {
+        margin-top: 30px;
+    }
+}
--- a/Modules/Report/Resources/lang/en/admin.php
+++ b/Modules/Report/Resources/lang/en/admin.php
@@ -60,53 +60,53 @@ return [
        'products_count' => 'Products Count',
        'total' => 'Total',

-        // coupons_report
+        # coupons_report
        'coupon_name' => 'Coupon Name',
        'coupon_code' => 'Coupon Code',

-        // customer orders report
+        # customer orders report
        'customer_name' => 'Customer Email',
        'customer_email' => 'Customer Email',
        'customer_group' => 'Customer Group',
        'guest' => 'Guest',
        'registered' => 'Registered',

-        // products purchase report
+        # products purchase report
        'qty' => 'Qty',

-        // products stock report
+        # products stock report
        'stock_availability' => 'Stock Availability',

-        // products view report
+        # products view report
        'views' => 'Views',

-        // branded products report
+        # branded products report
        'brand' => 'Brand',

-        // category products report
+        # category products report
        'category' => 'Category',

-        // taxed products report
+        # taxed products report
        'tax_class' => 'Tax Class',

-        // tagged products report
+        # tagged products report
        'tag' => 'Tag',

-        // sales report
+        # sales report
        'subtotal' => 'Subtotal',
        'shipping' => 'Shipping',
        'discount' => 'Discount',
        'tax' => 'Tax',

-        // search report
+        # search report
        'keyword' => 'Keyword',
        'results' => 'Results',
        'hits' => 'Hits',

-        // shipping report
+        # shipping report
        'shipping_method' => 'Shipping Method',

-        // tax report
+        # tax report
        'tax_name' => 'Tax Name',
    ],
 ];
--- a/Modules/Report/Resources/views/admin/reports/branded_products_report/index.blade.php
+++ b/Modules/Report/Resources/views/admin/reports/branded_products_report/index.blade.php
@@ -9,9 +9,9 @@
@endsection

@section('report_result')
-    <h3 class="tab-content-title">
+    <h5 class="tab-content-title">
        {{ trans('report::admin.filters.report_types.branded_products_report') }}
-    </h3>
+    </h5>

    <div class="table-responsive">
        <table class="table">
--- a/Modules/Report/Resources/views/admin/reports/categorized_products_report/index.blade.php
+++ b/Modules/Report/Resources/views/admin/reports/categorized_products_report/index.blade.php
@@ -9,9 +9,9 @@
@endsection

@section('report_result')
-    <h3 class="tab-content-title">
+    <h5 class="tab-content-title">
        {{ trans('report::admin.filters.report_types.categorized_products_report') }}
-    </h3>
+    </h5>

    <div class="table-responsive">
        <table class="table">
--- a/Modules/Report/Resources/views/admin/reports/coupons_report/index.blade.php
+++ b/Modules/Report/Resources/views/admin/reports/coupons_report/index.blade.php
@@ -13,9 +13,9 @@
@endsection

@section('report_result')
-    <h3 class="tab-content-title">
+    <h5 class="tab-content-title">
        {{ trans('report::admin.filters.report_types.coupons_report') }}
-    </h3>
+    </h5>

    <div class="table-responsive">
        <table class="table">
--- a/Modules/Report/Resources/views/admin/reports/customers_order_report/index.blade.php
+++ b/Modules/Report/Resources/views/admin/reports/customers_order_report/index.blade.php
@@ -18,9 +18,9 @@
@endsection

@section('report_result')
-    <h3 class="tab-content-title">
+    <h5 class="tab-content-title">
        {{ trans('report::admin.filters.report_types.customers_order_report') }}
-    </h3>
+    </h5>

    <div class="table-responsive">
        <table class="table">
--- a/Modules/Report/Resources/views/admin/reports/layout.blade.php
+++ b/Modules/Report/Resources/views/admin/reports/layout.blade.php
@@ -18,7 +18,7 @@

                <div class="col-lg-3 col-md-4">
                    <div class="filter-report clearfix">
-                        <h3 class="tab-content-title">{{ trans('report::admin.filter') }}</h3>
+                        <h5 class="tab-content-title">{{ trans('report::admin.filter') }}</h5>

                        <form method="GET" action="{{ route('admin.reports.index') }}">
                            <div class="form-group">
@@ -45,3 +45,10 @@
        </div>
    </div>
@endsection
+
+@push('globals')
+    @vite([
+        'Modules/Report/Resources/assets/admin/sass/main.scss',
+        'Modules/Report/Resources/assets/admin/js/main.js'
+    ])
+@endpush
--- a/Modules/Report/Resources/views/admin/reports/products_purchase_report/index.blade.php
+++ b/Modules/Report/Resources/views/admin/reports/products_purchase_report/index.blade.php
@@ -18,9 +18,9 @@
@endsection

@section('report_result')
-    <h3 class="tab-content-title">
+    <h5 class="tab-content-title">
        {{ trans('report::admin.filters.report_types.products_purchase_report') }}
-    </h3>
+    </h5>

    <div class="table-responsive">
        <table class="table">
--- a/Modules/Report/Resources/views/admin/reports/products_stock_report/index.blade.php
+++ b/Modules/Report/Resources/views/admin/reports/products_stock_report/index.blade.php
@@ -29,9 +29,9 @@
@endsection

@section('report_result')
-    <h3 class="tab-content-title">
+    <h5 class="tab-content-title">
        {{ trans('report::admin.filters.report_types.products_stock_report') }}
-    </h3>
+    </h5>

    <div class="table-responsive">
        <table class="table">
--- a/Modules/Report/Resources/views/admin/reports/products_view_report/index.blade.php
+++ b/Modules/Report/Resources/views/admin/reports/products_view_report/index.blade.php
@@ -13,9 +13,9 @@
@endsection

@section('report_result')
-    <h3 class="tab-content-title">
+    <h5 class="tab-content-title">
        {{ trans('report::admin.filters.report_types.products_view_report') }}
-    </h3>
+    </h5>

    <div class="table-responsive">
        <table class="table">
--- a/Modules/Report/Resources/views/admin/reports/sales_report/index.blade.php
+++ b/Modules/Report/Resources/views/admin/reports/sales_report/index.blade.php
@@ -8,9 +8,9 @@
@endsection

@section('report_result')
-    <h3 class="tab-content-title">
+    <h5 class="tab-content-title">
        {{ trans('report::admin.filters.report_types.sales_report') }}
-    </h3>
+    </h5>

    <div class="table-responsive">
        <table class="table">
--- a/Modules/Report/Resources/views/admin/reports/search_report/index.blade.php
+++ b/Modules/Report/Resources/views/admin/reports/search_report/index.blade.php
@@ -8,9 +8,9 @@
@endsection

@section('report_result')
-    <h3 class="tab-content-title">
+    <h5 class="tab-content-title">
        {{ trans('report::admin.filters.report_types.search_report') }}
-    </h3>
+    </h5>

    <div class="table-responsive">
        <table class="table">
--- a/Modules/Report/Resources/views/admin/reports/shipping_report/index.blade.php
+++ b/Modules/Report/Resources/views/admin/reports/shipping_report/index.blade.php
@@ -22,9 +22,9 @@
@endsection

@section('report_result')
-    <h3 class="tab-content-title">
+    <h5 class="tab-content-title">
        {{ trans('report::admin.filters.report_types.shipping_report') }}
-    </h3>
+    </h5>

    <div class="table-responsive">
        <table class="table">
--- a/Modules/Report/Resources/views/admin/reports/tagged_products_report/index.blade.php
+++ b/Modules/Report/Resources/views/admin/reports/tagged_products_report/index.blade.php
@@ -9,9 +9,9 @@
@endsection

@section('report_result')
-    <h3 class="tab-content-title">
+    <h5 class="tab-content-title">
        {{ trans('report::admin.filters.report_types.tagged_products_report') }}
-    </h3>
+    </h5>

    <div class="table-responsive">
        <table class="table">
--- a/Modules/Report/Resources/views/admin/reports/tax_report/index.blade.php
+++ b/Modules/Report/Resources/views/admin/reports/tax_report/index.blade.php
@@ -13,9 +13,9 @@
@endsection

@section('report_result')
-    <h3 class="tab-content-title">
+    <h5 class="tab-content-title">
        {{ trans('report::admin.filters.report_types.tax_report') }}
-    </h3>
+    </h5>

    <div class="table-responsive">
        <table class="table">
--- a/Modules/Report/Resources/views/admin/reports/taxed_products_report/index.blade.php
+++ b/Modules/Report/Resources/views/admin/reports/taxed_products_report/index.blade.php
@@ -17,9 +17,9 @@
@endsection

@section('report_result')
-    <h3 class="tab-content-title">
+    <h5 class="tab-content-title">
        {{ trans('report::admin.filters.report_types.taxed_products_report') }}
-    </h3>
+    </h5>

    <div class="table-responsive">
        <table class="table">