root 5 лет назад
Родитель
Сommit
35bf67164d

+ 47
- 0
.env.example Просмотреть файл

@@ -0,0 +1,47 @@
APP_NAME=Laravel
APP_ENV=local
APP_KEY=base64:wDRcykZN8RDAYhcl9gyWb+w18UIdnN41lj+jNf9yrk4=
APP_DEBUG=true
APP_URL=http://localhost

LOG_CHANNEL=stack

DB_CONNECTION=mysql
DB_HOST=127.0.0.1
DB_PORT=3306
DB_DATABASE=homestead
DB_USERNAME=homestead
DB_PASSWORD=secret

MONGO_DB_HOST=192.168.1.1
MONGO_DB_PORT=27017
MONGO_DB_DATABASE=production_cbb
MONGO_DB_USERNAME=
MONGO_DB_PASSWORD=

BROADCAST_DRIVER=log
CACHE_DRIVER=file
QUEUE_CONNECTION=sync
SESSION_DRIVER=file
SESSION_LIFETIME=120

REDIS_HOST=127.0.0.1
REDIS_PASSWORD=null
REDIS_PORT=6379

MAIL_DRIVER=smtp
MAIL_HOST=smtp.mailtrap.io
MAIL_PORT=2525
MAIL_USERNAME=null
MAIL_PASSWORD=null
MAIL_ENCRYPTION=null

PUSHER_APP_ID=
PUSHER_APP_KEY=
PUSHER_APP_SECRET=
PUSHER_APP_CLUSTER=mt1

MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"

JWT_SECRET=S9yDXbv8gQW3T2dG4Gm0he1sqEzTR4NO

+ 1
- 1
app/Http/Controllers/Api/FormController.php Просмотреть файл

@@ -92,7 +92,7 @@ class FormController extends BaseController

public function get_data_form(Request $request){

$dateS = Carbon::createFromFormat('Y-m-d', '2020-08-12');
$dateS = Carbon::createFromFormat('Y-m-d', '2020-01-01');
$start = $dateS->copy()->startOfDay();
$dateE = Carbon::createFromFormat('Y-m-d', '2020-08-31');
$end = $dateE->copy()->endOfDay();

+ 2
- 0
app/Http/Controllers/Api/WorkOrderMobile.php Просмотреть файл

@@ -204,6 +204,8 @@ class WorkOrderMobile extends BaseController
"cable_read" => $docket->cable_read,
"router" => $docket->router_serial_number,
"mac_router" => $docket->mac_router,
"modem_sn" => $docket->modem_sn,
"type_testing" => $docket->type_testing,
"condition" => $docket->condition,
"note" => $docket->Note,
"total_rating" => $total_rating,

+ 2
- 0
app/Http/Controllers/DS/TestController.php Просмотреть файл

@@ -739,6 +739,8 @@ class TestController extends Controller {
$docket->end_job = $doc->end_job;
$docket->router_serial_number = $doc->router_serial_number;
$docket->mac_router = $doc->mac_router;
$docket->modem_sn = $doc->modem_sn;
$docket->type_testing = $doc->type_testing;
$docket->cable_read = $doc->cable_read;
$docket->condition = $doc->condition;
$docket->Note = $doc->Note;

+ 8
- 2
app/Jobs/StoreDocket.php Просмотреть файл

@@ -50,8 +50,12 @@ class StoreDocket implements ShouldQueue
public function handle(Docket $docket)
{
$note = '';
if(isset($this->request['Note'])){
$mac_router ='';
$type_testing ='';
if(isset($this->request['Note']) || ($this->request['mac_router']) || ($this->request['type_testing'])){
$note = $this->request['Note'];
$mac_router = $this->request['mac_router'];
$type_testing = $this->request['type_testing'];
}
$docket->work_order_id = $this->request['wo'];
@@ -60,13 +64,15 @@ class StoreDocket implements ShouldQueue
$docket->installer_id = $this->staff;
$docket->end_job = Carbon::now()->toDateTimeString();
$docket->router_serial_number = $this->request['router_serial_number'];
$docket->mac_router = $this->request['mac_router'];
$docket->mac_router = $mac_router;
$docket->cable_read = $this->request['cable_read'];
$docket->condition = $this->request['condition'];
$docket->type_testing = $type_testing;
$docket->Note = $note;
$docket->Rating1 = $this->request['Rating1'];
$docket->Rating2 = $this->request['Rating2'];
$docket->Rating3 = $this->request['Rating3'];
$docket->modem_sn = $this->request['modem_sn'];
$docket->customer_signature = $this->signature;

$work_order = WorkOrder::where('wo',$this->request['wo'])->first();

+ 1
- 0
resources/views/pdf/docket-pdf.blade.php Просмотреть файл

@@ -146,6 +146,7 @@
<p>Router S/N : {{ $docket->router_serial_number }}</p>
<p>Cable Read : {{ $docket->cable_read }}</p>
<p>Mac Route : {{ $docket->mac_router }}</p></b>
<p>Modem S/N : {{ $docket->modem_sn }}</p>
</td>
</tr>
</table>

Загрузка…
Отмена
Сохранить