Skip to content

F
fazo
Commit 808a3ad2 authored by Khumoyunmirzo Sodiqov's avatar Khumoyunmirzo Sodiqov
Browse files
Options

fix

parent 37acfe61
Show whitespace changes
Inline Side-by-side
Showing with 281 additions and 256 deletions
app/Http/Controllers/DeliverySytemsController.php
View file @ 808a3ad2
......@@ -74,24 +74,24 @@ class DeliverySytemsController extends Controller
if ($order == null) {
return response()->json(['warning' => 'Order not found'], 200);
} elseif ($order['label_url'] == null) {
$street = $sender[0]->street; //'test str';
$city = $sender[0]->city_name; // 'Unit C1 Brooklyn';
$street = $sender[0]->street; //'97 Quentin Rd, 1st Floor';
$city = $sender[0]->city_name; // 'Brooklyn';
$stateOrProvinceCode = $sender[0]->city_name; // 'NY';
$postalCode = $sender[0]->zip; // '11229';
$postalCode = $sender[0]->zip; // '11223';
$countryCode = 'US'; //'US';
$weight = ($order['weight'] > 0) ? $order['weight'] : 1; // 10;
$weight = ($order['weight'] > 0) ? $order['weight'] : 1; // 20;
$userCredential = new WebAuthenticationCredential();
$userCredential
->setKey('dXw7hhDl5lS6mwqs')
->setPassword('DDOWpwxnnmPsUxWNSM8gXLIdD');
->setKey('WZmcVJM6rADSDHRA')
->setPassword('RFdr6uqXNvFpZVvwtoEaGLuRG');
$webAuthenticationDetail = new WebAuthenticationDetail();
$webAuthenticationDetail->setUserCredential($userCredential);
$clientDetail = new ClientDetail();
$clientDetail
->setAccountNumber('510087100')
->setMeterNumber('119157536');
->setAccountNumber('647927254')
->setMeterNumber('250557652');
$version = new VersionId();
$version
->setMajor(23)
......@@ -100,20 +100,23 @@ class DeliverySytemsController extends Controller
->setServiceId('ship');
$shipperAddress = new Address();
$shipperAddress
->setStreetLines([$street])
->setCity($city)
->setStateOrProvinceCode($stateOrProvinceCode)
->setPostalCode($postalCode)
->setCountryCode($countryCode);
->setStreetLines(['56 Christopher Columbus Dr'])
// ->setStreetLines([$street])
->setCity('Jersey City')
// ->setCity($city)
->setStateOrProvinceCode('NJ')
// ->setStateOrProvinceCode($stateOrProvinceCode)
->setPostalCode('07302')
->setCountryCode('US');
$shipperContact = new Contact();
$shipperContact
// ->setCompanyName('TuronExpresss')
// ->setCompanyName('FAZO CARGO INC.')
// ->setEMailAddress('test@example.com')
->setPersonName($sender[0]->firstname.' '.$sender[0]->secondname.' '.$sender[0]->fathername)
->setPersonName($sender[0]->firstname . ' ' . $sender[0]->secondname . ' ' . $sender[0]->fathername)
->setPhoneNumber(($sender[0]->phone));
$shipper = new Party();
$shipper
->setAccountNumber('510087100')
->setAccountNumber('250557652')
->setAddress($shipperAddress)
->setContact($shipperContact);
$recipientAddress = new Address();
......@@ -121,13 +124,13 @@ class DeliverySytemsController extends Controller
->setStreetLines(['97 Quentin Rd, 1st floor'])
->setCity('Brooklyn')
->setStateOrProvinceCode('NY')
->setPostalCode('11229')
->setPostalCode('11223')
->setCountryCode('US');
$recipientContact = new Contact();
$recipientContact
->setCompanyName('Fazo Cargo')
->setPersonName('Test FullName')
->setPhoneNumber('+1 347 547 9797');
->setCompanyName('FAZO CARGO INC.')
->setPersonName('Sheroz Mamayev')
->setPhoneNumber('+1 347 547.9797');
$recipient = new Party();
$recipient
->setAddress($recipientAddress)
......
app/Http/Controllers/OrderController.php
View file @ 808a3ad2
......@@ -125,9 +125,9 @@ class OrderController extends Controller
])->get();
}
$statuses = DB::select('SELECT s.id, s.sort, s.title, s.color_class, (SELECT count(*) FROM orders where status_id=s.id) as count FROM status s');
$statuses = DB::select('SELECT s.id, s.sort, s.title, s.color_class, (SELECT count(*) FROM orders where status_id=s.id and client_id='.$id.') as count FROM status s');
$count = DB::select('SELECT COUNT(*) as count FROM orders');
$count = DB::select('SELECT COUNT(*) as count FROM orders where client_id='.$id);
// dd($orders);
......@@ -217,7 +217,7 @@ class OrderController extends Controller
$order = Orders::create([
'client_id' => $request->get('client_id'),
'client_id' => $user->id,
'name' => $request->get('name'),
'flight_id' => 0,
'added' => Carbon::now(),
......
app/Http/Controllers/Postman/DeclarationController.php
View file @ 808a3ad2
......@@ -120,6 +120,14 @@ class DeclarationController extends Controller
'order_id',
])->where('order_id', '=', $orderData[0]->id)->get();
// return view('templates.declaration', [
// 'title' => 'Declaration #',
// 'client' => $clientData,
// 'order' => $orderData[0],
// 'recipient' => $recipient[0],
// 'sender' => $sender[0],
// 'product' => $products
// ]);
$pdf = \Barryvdh\DomPDF\Facade::loadView('templates.declaration', [
'title' => 'Declaration #',
'client' => $clientData,
......@@ -134,7 +142,7 @@ class DeclarationController extends Controller
$pdf->save($path . $filename);
// Activity::appendLog("Сгенерирована декларация в PDF формате.", Activity::NOTICE);
return redirect(url($path . $filename));
// return response()->json(['url' => url($path.$filename).''], 200);
// return response()->json(['url' => url($path . $filename) . ''], 200);
// return $pdf->download('declaration.pdf');
}
......
app/Models/Orders.php
View file @ 808a3ad2
......@@ -44,6 +44,7 @@ class Orders extends Authenticatable
'delivery_info',
'label_url',
'payment_info',
'comment',
'status_id'
];
......
resources/views/pages/parcels/order_create.blade.php
View file @ 808a3ad2
......@@ -955,7 +955,7 @@
' </td>\n' +
' <td class="col-2">\n' +
' <div class="input-group input-group-sm">\n' +
' <input type="number" name="products[' + counter + '][1]" class="form-control form-control-sm count" id="" value="1" required>\n' +
' <input type="number" name="products[' + counter + '][1]" class="form-control form-control-sm count" value="1" required>\n' +
' <div class="invalid-feedback" >\n' +
' Укажите количество единиц товара\n' +
' </div>\n' +
......@@ -963,7 +963,7 @@
' </td>\n' +
' <td class="col-2">\n' +
' <div class="input-group input-group-sm">\n' +
' <input type="number" name="products[' + counter + '][2]" class="form-control form-control-sm cost" id="" placeholder="Username" value="2" required>\n' +
' <input type="number" name="products[' + counter + '][2]" class="form-control form-control-sm cost" value="2" required>\n' +
' <div class="invalid-feedback" >\n' +
' Укажите стоимость за единицу товара\n' +
' </div>\n' +
......@@ -971,7 +971,7 @@
' </td>\n' +
' <td class="col-2">\n' +
' <div class="input-group input-group-sm">\n' +
' <input type="text" step="0.1" name="products[' + counter + '][3]" class="form-control form-control-sm" id="username" required>\n' +
' <input type="text" name="products[' + counter + '][3]" class="form-control form-control-sm" required>\n' +
' <div class="invalid-feedback" >\n' +
' Your username is required.\n' +
' </div>\n' +
......
resources/views/templates/declaration.blade.php
View file @ 808a3ad2
......@@ -8,170 +8,194 @@
font-family: "DejaVu Sans";
font-size: 9px;
}
.main-logo {
border: 1px solid #000;
width: 100px;
}
.border-left {
border-left: 1px solid #000;
}
.border-right {
border-right: 1px solid #000;
}
.border-top {
border-top: 1px solid #000;
}
.border-bottom {
border-bottom: 1px solid #000;
}
.caption {
border: 1px solid #000;
border-collapse: collapse;
}
.gray-colored { background-color: #ebebeb}
.caption td { padding: 3px}
.gray-colored {
background-color: #ebebeb
}
.caption td {
padding: 3px
}
</style>
</head>
<body>
<div class="">
<div>
<img width="100" height="100" src="{{ asset('android-chrome-192x192.png') }}">
<h1>FAZO CARGO INC. Tel.:(347) 547-9797</h1>
</div>
<hr />
<table border="0" style="width: 100%">
<h1 style="float: right; margin-top: 35px;">FAZO CARGO INC. Tel.:(347) 547-9797</h1>
</div>
<br>
<hr/>
<table border="0" style="width: 100%">
<tr>
<td><span>ПОЧТОВАЯ АДМИНИСТРАЦИЯ</span></td>
<td style="width: 70px"><span ><input type="checkbox" style="margin-right: 17px;margin-left: 10px;"> USA</span></td>
<td style="width: 50px;"><input type="checkbox" style="margin-left: 10px;"> </td>
<td style="width: 70px"><span><input type="checkbox" style="margin-right: 17px;margin-left: 10px;"> USA</span>
</td>
<td style="width: 50px;"><input type="checkbox" style="margin-left: 10px;"></td>
<td><span>ТАМОЖЕННАЯ ДЕКЛАРАЦИЯ <b>CN 23<</b></span></td>
</tr>
<tr >
<tr>
<td><span>ADMINISTRATION</span></td>
<td><span ><input type="checkbox" style="margin-right: 17px;margin-left: 10px;"> CDN</span></td>
<td style="width: 50px"><input type="checkbox" style="margin-left: 10px;"> </td>
<td><span><input type="checkbox" style="margin-right: 17px;margin-left: 10px;"> CDN</span></td>
<td style="width: 50px"><input type="checkbox" style="margin-left: 10px;"></td>
<td><span>CUSTOM DECLARATION</span></td>
</tr>
</table>
</table>
<br />
<table class="caption" style="width: 100%;">
<br/>
<table class="caption" style="width: 100%;">
<tr>
<td rowspan="4" class="border-right border-bottom gray-colored" style="width: 20px">FROM</td>
<td class="border-right gray-colored" style="width: 180px;">
Name and address of Sender <br />
Name and address of Sender <br/>
Фамилия и адрес Отправителя
</td>
<td class="border-right">
Tel. {{ $sender->phone }}
</td>
<td class="border-right" style="width: 70px;">AGENT CODE:</td>
<td class="border-right" style="width: 123px"> - </td>
<td rowspan="9" style="width: 70px;"><img src="{{ asset('images/declaration/declaration_part1.png') }}" width="163"> </td>
<td class="border-right" style="width: 70px;">CODE:</td>
<td class="border-right" style="width: 123px">{{ $client->uni_code }}</td>
<td rowspan="10" style="width: 70px;"><img src="{{ asset('images/declaration/declaration_part1.png') }}"
width="163"></td>
</tr>
<tr>
<td colspan="2" class="border-top border-bottom border-right">Name: <b>Ruslan Skaldin</b></td>
<td rowspan="3" colspan="2" class="border-top border-right border-bottom" ><center><b style="font-size: 14px">33097</b></center></td>
<td colspan="2" class="border-top border-bottom border-right">Name:
<b>{{ $sender->firstname.' '.$sender->secondname.' '.$sender->fathername }}</b></td>
<td rowspan="3" colspan="2" class="border-top border-right border-bottom">
<h6>Посылка</h6>
<center><b style="font-size: 14px">{{ $order->track_number }}</b></center>
</td>
</tr>
<tr>
<td colspan="2" class="border-bottom border-right">Address:</td>
</tr>
<tr>
<td colspan="2" class="border-right">-</td>
<td colspan="2"
class="border-right">{{ $sender->zip . ' ' .$sender->apartment . ', ' . $sender->house. ', ' . $sender->street . ', ' . $sender->city . ', ' . $sender->country }}</td>
</tr>
<tr>
<td rowspan="5" class="border-right gray-colored">A <br /> B</td>
<td rowspan="6" class="border-right gray-colored">TO</td>
<td colspan="2" class="border-bottom border-top border-right gray-colored" style="width: 310px">
Name and address of Recipient, Including the country of destination<br />
Name and address of Recipient, Including the country of destination<br/>
Фамилия и адрес Получателя, включая страну назначения
</td>
<td colspan="2" class="border-bottom border-right" >Tel. <b>+998909697399</b></td>
<td colspan="2" class="border-bottom border-right">Tel. <b>{{ $recipient->phone }}</b></td>
</tr>
<tr>
<td class="border-bottom">Country <br/>Страна</td>
<td class="border-bottom"><b>{{ $recipient->country }}</b></td>
<td class="border-bottom">Region <br/>Область</td>
<td class="border-bottom border-right"><b>{{ $recipient->city }}</b></td>
</tr>
<tr>
<td class="border-bottom">Country <br />Страна</td>
<td class="border-bottom"><b>Uzbekistan</b></td>
<td class="border-bottom">Region <br />Область</td>
<td class="border-bottom border-right"><b>Tashkent</b></td>
<td class="border-bottom">Street <br/>Улица</td>
<td class="border-bottom"><b>{{ $recipient->street }}</b></td>
<td class="border-bottom">Number <br/>Дом</td>
<td class="border-bottom border-right"><b>{{ $recipient->street }}</b></td>
</tr>
<tr >
<td class="border-bottom">District <br />Район</td>
<td class="border-bottom"><b>Юнусабадский район</b></td>
<td class="border-bottom">City, Village <br />Город, Деревня</td>
<td class="border-bottom border-right"><b>Tashkent</b></td>
<tr>
<td class="border-bottom">Apartment <br/>Квартира</td>
<td class="border-bottom"><b>{{ $recipient->apartment }}</b></td>
<td class="border-bottom">Zip <br/>Индекс</td>
<td class="border-bottom border-right"><b>{{ $recipient->zip }}</b></td>
</tr>
<tr>
<td class="border-bottom">Street <br />Улица</td>
<td class="border-bottom"><b>Yunus Ota str</b></td>
<td class="border-bottom">Number <br />Дом</td>
<td class="border-bottom border-right"><b>Tashkent</b></td>
<td class="border-bottom">Name <br/>Фамилия, Имя, Отчество</td>
<td colspan="3" class="border-bottom border-right">
<b>{{ $recipient->firstname.' '.$recipient->secondname.' '.$recipient->fathername }}</b></td>
</tr>
<tr>
<td>Name <br />Фамилия, Имя, Отчество</td>
<td colspan="3" class="border-right"><b>Руслан</b></td>
<td>Passport data <br/>Паспортные данные</td>
<td colspan="3" class="border-right">
<b>{{ $recipient->passport.' | '.$recipient->passport_by.', '.$recipient->passport_issue }}</b></td>
</tr>
</table>
</table>
<table class="caption" style="width: 100%; border-top: none">
<table class="caption" style="width: 100%; border-top: none">
<tr>
<td class="border-bottom gray-colored">
The register of enclosure (and number of goods) <br />
The register of enclosure (and number of goods) <br/>
Опись вложений (и количество предметов)
</td>
<td class="border-bottom gray-colored">
Qty.<br />
Кол-во
</td>
<td class="border-bottom gray-colored">
Country of goods origin <br />
Страна изгот. товара
Quantity<br/>
Количество
</td>
<td class="border-bottom gray-colored">
Tariff No. <br />
No. тарифа
Value <br/>
Ценность
</td>
<td class="border-bottom gray-colored">
Weight netto <br />
Вес нетто
</td>
<td class="border-bottom gray-colored">
Value <br />
Ценность
Comment <br/>
Комментарий
</td>
</tr>
{{-- @foreach($declaration as $item)--}}
{{-- @foreach($declaration as $item)--}}
@foreach($product as $item)
<tr>
<td class="border-bottom border-right">name</td>
<td class="border-bottom border-right">MOUT</td>
<td class="border-bottom border-right">USA</td>
<td class="border-bottom border-right">V</td>
<td class="border-bottom border-right">WEIGHT</td>
<td class="border-bottom border-right">PRICE</td>
<td class="border-bottom border-right">{{ $item->title}}</td>
<td class="border-bottom border-right">{{ $item->amount }}</td>
<td class="border-bottom border-right">{{ $item->price }}</td>
<td class="border-bottom border-right">{{ $item->comment }}</td>
</tr>
{{-- @endforeach--}}
</table>
<table class="caption" style="width: 100%;">
@endforeach
</table>
<table class="caption" style="width: 100%;">
<tr>
<td class="gray-colored"><input type="checkbox"></td>
<td class="gray-colored">
Commercial sample<br />
Commercial sample<br/>
Коммерческий образец
</td>
<td class="gray-colored"><input type="checkbox"> </td>
<td class="gray-colored"><input type="checkbox"></td>
<td class="gray-colored">
Documents<br />
Documents<br/>
Документы
</td>
<td class="gray-colored"><input type="checkbox"> </td>
<td class="gray-colored"><input type="checkbox"></td>
<td class="gray-colored">
Present<br />
Present<br/>
Подарок
</td>
</tr>
<tr>
<td colspan="6" class="border-top">
Notes: <br />
Примечания: <br /> <br />
<td class="border-top">
Notes: <br/>
Примечания: <br/> <br/>
</td>
<td colspan="5" class="border-top">
{{ $order->comment }}
</td>
</tr>
<tr>
......@@ -184,17 +208,17 @@
<td colspan="3">Дата ____________</td>
</tr>
<tr>
<td colspan="3">Фамилия</td>
<td colspan="3">Паспорт</td>
<td colspan="3">Фамилия: {{ $recipient->secondname }}</td>
<td colspan="3">Паспорт: {{ $recipient->passport }}</td>
</tr>
</table>
<table style="border-collapse: collapse; border: none;">
</table>
<table style="border-collapse: collapse; border: none;">
<tr>
<td style="width: 40%" valign="top">
<table class="caption" style="width: 100%;">
<tr>
<td class="border-right">Rate:</td>
<td>Weight:</td>
<td>Weight: {{ $recipient->weight }}</td>
</tr>
<tr>
<td colspan="2" class="border-top">Cost:</td>
......@@ -210,7 +234,7 @@
</tr>
<tr>
<td colspan="2" class="border-top">
<b>Total:</b> <b style="font-size: 14px"> $ {{--{{ $package->items_cost() }}--}}</b>
<b>Total:</b> <b style="font-size: 14px"> $ {{ $order->summa }}</b>
</td>
</tr>
</table>
......@@ -221,16 +245,16 @@
<td class="gray-colored"><input type="checkbox"></td>
<td class="gray-colored">KG</td>
<td rowspan="2" class="gray-colored">
Weight, brutto<br />
Weight, brutto<br/>
Общий вес, брутто
</td >
</td>
<td rowspan="2" class="gray-colored">
Bureau and date of origin<br/>
Организация, дата подачи <br />
Организация, дата подачи <br/>
</td>
</tr>
<tr>
<td class="gray-colored"><input type="checkbox"> </td>
<td class="gray-colored"><input type="checkbox"></td>
<td class="gray-colored">LBS</td>
</tr>
<tr>
......@@ -238,21 +262,23 @@
<p>
<b>FOR SENDER</b>, sender, hereby state that above information is true and correct
to the best of my knowledge and that my shipment does not contain any dangerous
goods which are prohibited by postal regulations. This parcel does not contain cash and jewelery.
goods which are prohibited by postal regulations. This parcel does not contain cash and
jewelery.
</p>
<p>
Я, отправитель, своей подписью подтверждаю, что сведения, приводенные в данной декларации,
являются точными, отправление не содержит валюты, ювелирных изделий, опасных вложений, запрещенных
являются точными, отправление не содержит валюты, ювелирных изделий, опасных вложений,
запрещенных
к перессылке попчтовыми правилами.
</p>
Date: <b>{{ date('Y-m-d') }}</b> Signature of Sender: <b>Ruslan Skaldin</b>
Date: <b>{{ date('Y-m-d') }}</b> Signature of Sender:
<b>{{ $client->name.' '.$client->surname }}</b>
</td>
</tr>
</table>
</td>
</tr>
</table>
</table>
</body>
......
routes/web.php
View file @ 808a3ad2
......@@ -66,8 +66,6 @@ Route::get('/refresh', 'Auth\LoginController@refresh')->name('refresh');
Route::post('/feedback/add', 'FeedbackController@addGuest');
//
//Route::get('/packages/pay', 'PackagesController@pay');
//Route::get('/packages/addr', 'PackagesController@addr');
Route::get('/packages', 'OrderController@index')->name('package')->middleware('auth');
Route::get('/packages/create/{id}', 'OrderController@create')->name('package.create')->middleware('auth');
Route::post('/packages/order-store', 'OrderController@orderStore')->name('package.store')->middleware('auth');
......@@ -82,17 +80,6 @@ Route::get('/profile', 'ProfileController@profile')->middleware('auth');
Route::post('/profile/save', 'ProfileController@save')->name('profile.save')->middleware('auth');
Route::get('/get-fedex-label/{id}', 'DeliverySytemsController@getFedexData')->middleware('auth');
//
//Route::get('/packages/list', 'PackagesController@pending_packages');
//Route::get('/packages/pending', 'PackagesController@pending_packages')->name('packagePending');
//Route::get('/packages/warehouse', 'PackagesController@inwarehouse_packages')->name('packageInwarehouse');
//Route::post('/packages/warehouse', 'PackagesController@inwarehouse_packages');
//Route::get('/packages/packing', 'PackagesController@onpacking_packages')->name('packagePacking');
//Route::get('/packages/register', 'PackagesController@register');
//Route::post('/packages/register', 'PackagesController@register');
//Route::get('/packages/sent', 'PackagesController@sent_packages')->name('packageSent');
//Route::get('/packages/all', 'PackagesController@all_packages')->name('packageAll');
//Route::get('/package/{id}/delivered', 'PackagesController@make_delivered')->where(['id' => '[0-9]+'])->name('makeDelivered');
//Route::get('packages/delivered', 'PackagesController@delivered_packages')->name('packageDelivered');
Route::get('/profile/info', 'ProfileController@info')->middleware('auth');
Route::post('/profile/address/add', 'ProfileController@address_add')->middleware('auth');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment