payment/backend
1
0
Fork 0
Code Issues Pull Requests 3 Actions Packages Projects Releases Wiki Activity

Merge pull request 'feature/FixReportExcel' (#5) from feature/FixReportExcel into develop

Browse Source 
Reviewed-on: http://git.witel.ir/RMS/Backend/pulls/5
This commit is contained in:
amirghasempoor
2026-01-27 08:03:20 +00:00
parent d662ff6517 81bd7532e9
commit 8db5650c4c
8 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.env.example
View File

@@ -98,7 +98,7 @@ HARIM_NEED_GUARANTEE_LETTER_URL='https://zamin.gov.ir/ow/api/ow/esb/response'
HARIM_NEED_GUARANTEE_LETTER_PASSWORD= HARIM_NEED_GUARANTEE_LETTER_PASSWORD=
HARIM_NEED_GUARANTEE_LETTER_USERNAME= HARIM_NEED_GUARANTEE_LETTER_USERNAME=
BACKUP_TARGET_DIR= BACKUP_TARGET_DIR=/var
BACKUP_USER= BACKUP_USER=
BACKUP_PASSWORD=1qaz BACKUP_PASSWORD=1qaz

2
app/Exports/V3/Mission/Report/Violation/CountryReport.php
View File

@@ -94,7 +94,7 @@ class CountryReport implements FromView, ShouldAutoSize, WithDrawings, WithEvent
$drawing2->setHeight(50); $drawing2->setHeight(50);
$drawing2->setOffsetX(5); $drawing2->setOffsetX(5);
$drawing2->setOffsetY(5); $drawing2->setOffsetY(5);
$drawing2->setCoordinates('E1'); $drawing2->setCoordinates('G1');
return [$drawing, $drawing2]; return [$drawing, $drawing2];
} }

2
app/Exports/V3/Mission/Report/Violation/ProvinceReport.php
View File

@@ -98,7 +98,7 @@ class ProvinceReport implements FromView, ShouldAutoSize, WithDrawings, WithEven
$drawing2->setHeight(50); $drawing2->setHeight(50);
$drawing2->setOffsetX(5); $drawing2->setOffsetX(5);
$drawing2->setOffsetY(5); $drawing2->setOffsetY(5);
$drawing2->setCoordinates('E1'); $drawing2->setCoordinates('G1');
return [$drawing, $drawing2]; return [$drawing, $drawing2];
} }

4
app/Http/Controllers/V3/Dashboard/Mission/Report/ReportTradodController.php
View File

@@ -2,8 +2,8 @@
namespace App\Http\Controllers\V3\Dashboard\Mission\Report; namespace App\Http\Controllers\V3\Dashboard\Mission\Report;
use App\Exports\V3\Mission\Report\Violation\CountryReport; use App\Exports\V3\Mission\Report\Tradod\CountryReport;
use App\Exports\V3\Mission\Report\Violation\ProvinceReport; use App\Exports\V3\Mission\Report\Tradod\ProvinceReport;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use App\Http\Traits\ApiResponse; use App\Http\Traits\ApiResponse;
use App\Models\City; use App\Models\City;

6
resources/views/v3/Reports/Mission/Report/CountryActivityReport.blade.php
View File

@@ -27,18 +27,18 @@
<table> <table>
<thead> <thead>
<tr> <tr>
<th colspan="3" <th colspan="7"
style="background-color: #DAEEF3;text-align: center;border-right: 1px solid black;font-weight:bolder;"> style="background-color: #DAEEF3;text-align: center;border-right: 1px solid black;font-weight:bolder;">
تاریخ دریافت گزارش: {{ verta()->now()->format('Y/m/d H:i') }} تاریخ دریافت گزارش: {{ verta()->now()->format('Y/m/d H:i') }}
</th> </th>
</tr> </tr>
<tr> <tr>
<th colspan="3" <th colspan="7"
style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;"> style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;">
</th> </th>
</tr> </tr>
<tr> <tr>
<th colspan="3" <th colspan="7"
style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;font-size: 13px;"> style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;font-size: 13px;">
گزارش نخلف های صورت گرفته گزارش نخلف های صورت گرفته
</th> </th>

6
resources/views/v3/Reports/Mission/Report/ProvinceActivityReport.blade.php
View File

@@ -27,18 +27,18 @@
<table> <table>
<thead> <thead>
<tr> <tr>
<th colspan="3" <th colspan="7"
style="background-color: #DAEEF3;text-align: center;border-right: 1px solid black;font-weight:bolder;"> style="background-color: #DAEEF3;text-align: center;border-right: 1px solid black;font-weight:bolder;">
تاریخ دریافت گزارش: {{ verta()->now()->format('Y/m/d H:i') }} تاریخ دریافت گزارش: {{ verta()->now()->format('Y/m/d H:i') }}
</th> </th>
</tr> </tr>
<tr> <tr>
<th colspan="3" <th colspan="7"
style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;"> style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;">
</th> </th>
</tr> </tr>
<tr> <tr>
<th colspan="3" <th colspan="7"
style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;font-size: 13px;"> style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;font-size: 13px;">
گزارش نخلف های صورت گرفته گزارش نخلف های صورت گرفته
</th> </th>

6
resources/views/v3/Reports/Mission/Report/Tradod /CountryActivityReport.blade.php
View File

@@ -27,18 +27,18 @@
<table> <table>
<thead> <thead>
<tr> <tr>
<th colspan="7" <th colspan="11"
style="background-color: #DAEEF3;text-align: center;border-right: 1px solid black;font-weight:bolder;"> style="background-color: #DAEEF3;text-align: center;border-right: 1px solid black;font-weight:bolder;">
تاریخ دریافت گزارش: {{ verta()->now()->format('Y/m/d H:i') }} تاریخ دریافت گزارش: {{ verta()->now()->format('Y/m/d H:i') }}
</th> </th>
</tr> </tr>
<tr> <tr>
<th colspan="7" <th colspan="11"
style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;"> style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;">
</th> </th>
</tr> </tr>
<tr> <tr>
<th colspan="7" <th colspan="11"
style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;font-size: 13px;"> style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;font-size: 13px;">
گزارش نخلف های صورت گرفته گزارش نخلف های صورت گرفته
</th> </th>

6
resources/views/v3/Reports/Mission/Report/Tradod /ProvinceActivityReport.blade.php
View File

@@ -27,18 +27,18 @@
<table> <table>
<thead> <thead>
<tr> <tr>
<th colspan="7" <th colspan="11"
style="background-color: #DAEEF3;text-align: center;border-right: 1px solid black;font-weight:bolder;"> style="background-color: #DAEEF3;text-align: center;border-right: 1px solid black;font-weight:bolder;">
تاریخ دریافت گزارش: {{ verta()->now()->format('Y/m/d H:i') }} تاریخ دریافت گزارش: {{ verta()->now()->format('Y/m/d H:i') }}
</th> </th>
</tr> </tr>
<tr> <tr>
<th colspan="7" <th colspan="11"
style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;"> style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;">
</th> </th>
</tr> </tr>
<tr> <tr>
<th colspan="7" <th colspan="11"
style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;font-size: 13px;"> style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;font-size: 13px;">
گزارش نخلف های صورت گرفته گزارش نخلف های صورت گرفته
</th> </th>