finishing to dev

Modules/Business/resources/views/stocks/datas.blade.php

@@ -2,10 +2,9 @@
     <table class="table" id="datatable">
         <thead>
             <tr>
-                <th class="text-start d-print-none">{{ __('SL') }}.</th>
+                <th>{{ __('SL') }}.</th>
                 <th class="text-start">{{ __('Product') }}</th>
                 <th class="text-start">{{ __('Code') }}</th>
-                <th class="text-start d-print-none">{{ __('HSN Code') }}</th>
                 <th class="text-start">{{ __('Category') }}</th>
                 @usercan('stocks.price')
                     <th class="text-start">{{ __('Cost') }}</th>
@@ -25,7 +24,8 @@
                     });
                 @endphp
                 <tr>
-                    <td class="text-start d-print-none">{{ ($products->currentPage() - 1) * $products->perPage() + $loop->iteration }}</td>
+                    <td>{{ ($products->currentPage() - 1) * $products->perPage() + $loop->iteration }}</td>
+
                     <td class="text-start">
                         @php
                             $stocks = $product->stocks->map(function ($batch) use ($product) {
@@ -36,7 +36,6 @@
                                     'productSalePrice' => $batch->productSalePrice ?? 0,
                                     'productDealerPrice' => $batch->productDealerPrice ?? 0,
                                     'productPurchasePrice' => $batch->productPurchasePrice ?? 0,
-                                    'exclusive_price' => $batch->exclusive_price ?? 0,
                                     'productWholeSalePrice' => $batch->productWholeSalePrice ?? 0,
                                     'warehouse' => $batch->warehouse?->name ?? ($product->warehouse?->name ?? ''),
                                     'rack' => $product->rack?->name ?? '',
@@ -49,8 +48,8 @@
                             {{ $product->productName }}
                         </a>
                     </td>
+
                     <td class="text-start">{{ $product->productCode }}</td>
-                    <td class="text-start d-print-none">{{ $product->hsn_code }}</td>
                     <td class="text-start">{{ $product->category->categoryName ?? '' }}</td>
                     @usercan('stocks.price')
                         <td class="text-start">
@@ -68,21 +67,13 @@
             @endforeach
 
             @if ($products->count() > 0)
-                <tr class="table-footer">
-                    <td class="text-start">{{ __('Total') }}</td>
-                    <td></td>
-                    <td class="d-print-none"></td>
-                    <td class="d-print-none"></td>
-                    <td></td>
-                    @usercan('stocks.price')
-                    <td></td>
-                    @endusercan
-                    <td class="text-start">
-                        {{ $total_stock_qty }}
+                <tr>
+                    <td colspan="{{ auth()->user()->can('stocks.price') || !auth()->user()->visibility ? 7 : 6 }}"
+                        class="text-end">
+                        <strong>{{ __('Total Stock Value:') }}</strong>
                     </td>
-                    <td></td>
                     <td class="text-end">
-                        {{ currency_format($total_stock_value, currency: business_currency()) }}
+                        <strong>{{ currency_format($total_stock_value, currency: business_currency()) }}</strong>
                     </td>
                 </tr>
             @endif

Modules/Business/resources/views/stocks/excel-csv.blade.php

@@ -4,11 +4,8 @@
             <th>{{ __('SL') }}.</th>
             <th>{{ __('Product') }}</th>
             <th>{{ __('Code') }}</th>
-            <th>{{ __('HSN Code') }}</th>
             <th>{{ __('Category') }}</th>
-            @usercan('stocks.price')
-                <th>{{ __('Cost') }}</th>
-            @endusercan
+            <th>{{ __('Cost') }}</th>
             <th>{{ __('Qty') }}</th>
             <th>{{ __('Sale') }}</th>
             <th>{{ __('Stock Value') }}</th>
@@ -26,11 +23,10 @@
             <tr>
                 <td>{{ $loop->index + 1 }}</td>
                 <td>{{ $product->productName }}</td>
-                <td>{{ $product->productCode }}</td>
-                <td>{{ $product->hsn_code }}</td>
-                <td>{{ $product->category->categoryName ?? '' }}</td>
+                <td class="text-start">{{ $product->productCode }}</td>
+                <td class="text-start">{{ $product->category->categoryName ?? '' }}</td>
                 @usercan('stocks.price')
-                <td>
+                <td class="text-start">
                     {{ currency_format(optional($firstStock)->productPurchasePrice, currency: business_currency()) }}
                 </td>
                 @endusercan
@@ -44,23 +40,4 @@
             </tr>
         @endforeach
     </tbody>
-    @if ($products->count() > 0)
-        <tr class="table-footer">
-            <td class="text-start">{{ __('Total') }}</td>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td></td>
-            @usercan('stocks.price')
-            <td></td>
-            @endusercan
-            <td class="text-start">
-                {{ $total_stock_qty }}
-            </td>
-            <td></td>
-            <td class="text-end">
-                {{ currency_format($total_stock_value, currency: business_currency()) }}
-            </td>
-        </tr>
-    @endif
 </table>

Modules/Business/resources/views/stocks/index.blade.php

@@ -15,12 +15,12 @@
             <div class="d-flex align-items-center justify-content-center gap-3">
                 <div class="profit-card p-3 text-white">
                     <p class="stat-title">{{ __('Total Quantity') }}</p>
-                    <p class="stat-value" id="total_stock_qty">{{ $total_stock_qty }}</p>
+                    <p class="stat-value">{{ $total_qty }}</p>
                 </div>
 
                 <div class="loss-card p-3 text-white">
                     <p class="stat-title">{{ __('Total Stock Value') }}</p>
-                    <p class="stat-value" id="total_stock_value">{{ currency_format($total_stock_value, currency : business_currency()) }}</p>
+                    <p class="stat-value">{{ currency_format($total_stock_value, currency : business_currency()) }}</p>
                 </div>
             </div>
         </div>
@@ -36,7 +36,7 @@
                 </div>
 
                 <div class="table-top-form p-16">
-                    <form action="{{ route('business.stocks.index') }}" method="GET" class="report-filter-form" table="#stock-data">
+                    <form action="{{ route('business.stocks.index') }}" method="GET" class="filter-form" table="#stock-data">
 
                         @if(request('alert_qty'))
                             <input type="hidden" name="alert_qty" value="{{ request('alert_qty') }}">
@@ -67,17 +67,17 @@
                     <div class="table-top-btn-group d-print-none">
                         <ul>
                             <li>
-                                <a class="export-btn" href="{{ route('business.stocks.csv') }}">
+                                <a href="{{ route('business.stocks.csv', ['alert_qty' => request('alert_qty')]) }}">
                                     <img src="{{ asset('assets/images/logo/csv.svg') }}" alt="">
                                 </a>
                             </li>
                             <li>
-                                <a class="export-btn" href="{{ route('business.stocks.excel') }}">
+                                <a href="{{ route('business.stocks.excel', ['alert_qty' => request('alert_qty')]) }}">
                                     <img src="{{ asset('assets/images/logo/excel.svg') }}" alt="">
                                 </a>
                             </li>
                             <li>
-                                <a class="export-btn" target="_blank" href="{{ route('business.stocks.pdf') }}">
+                                <a target="blank" href="{{ route('business.stock-reports.pdf', ['alert_qty' => request('alert_qty')]) }}">
                                     <img src="{{ asset('assets/images/logo/pdf.svg') }}" alt="">
                                 </a>
                             </li>

Modules/Business/resources/views/stocks/stock-modal.blade.php

@@ -14,8 +14,7 @@
                                     <th>{{ __('Batch') }}</th>
                                     <th>{{ __('Stock') }}</th>
                                     @usercan('stocks.price')
-                                    <th>{{ __('Purchase Price (Inc. tax)') }}</th>
-                                    <th>{{ __('Purchase Price (Exc. tax)') }}</th>
+                                    <th>{{ __('Purchase Price') }}</th>
                                     @endusercan
                                     <th>{{ __('MRP') }}</th>
                                     <th>{{ __('WholeSale Price') }}</th>